aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools/android/launcher
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-26 20:39:11 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-26 20:39:11 +0000
commit3daa1aed7a817f296fffb1e24f86bcb6bf56ce2f (patch)
tree77ecee952a8a39f5b0a1cf8eaaa0d99ed678dd74 /platform_tools/android/launcher
parentee21a3e395298021ca70e0d72bf2d983b2fc9225 (diff)
Support linking skia statically on Android
Support linking skia statically on Android. Skia symbols should be exported by the app library, to the extent that skia_launcher needs them. Syncs libskia_android.so to the device only if it exists. R=djsollen@google.com Author: kkinnunen@nvidia.com Review URL: https://codereview.chromium.org/61893008 git-svn-id: http://skia.googlecode.com/svn/trunk@12399 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools/android/launcher')
-rw-r--r--platform_tools/android/launcher/skia_launcher.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/platform_tools/android/launcher/skia_launcher.cpp b/platform_tools/android/launcher/skia_launcher.cpp
index 718a7173da..746d470a3c 100644
--- a/platform_tools/android/launcher/skia_launcher.cpp
+++ b/platform_tools/android/launcher/skia_launcher.cpp
@@ -67,12 +67,16 @@ int main(int argc, const char** argv) {
return -1;
}
+ void* skiaLibrary;
+
+#if defined(SKIA_DLL)
// load the local skia shared library
- void* skiaLibrary = load_library(appLocation, "skia_android");
+ skiaLibrary = load_library(appLocation, "skia_android");
if (NULL == skiaLibrary)
{
return -1;
}
+#endif
// load the appropriate library
void* appLibrary = load_library(appLocation, argv[1]);
@@ -80,6 +84,10 @@ int main(int argc, const char** argv) {
return -1;
}
+#if !defined(SKIA_DLL)
+ skiaLibrary = appLibrary;
+#endif
+
// find the address of the main function
int (*app_main)(int, const char**);
*(void **) (&app_main) = dlsym(appLibrary, "main");