diff options
author | rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-02 13:50:38 +0000 |
---|---|---|
committer | rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-02 13:50:38 +0000 |
commit | d6bab0238655dbab24dfe92bd0b16b464310a8c7 (patch) | |
tree | 664de29dd3b91a1ed1be463f2cd797e871cabec7 /platform_tools/android/launcher/skia_launcher.cpp | |
parent | 5b39f5ba9c339d1e4dae391fee9ec1396feec180 (diff) |
Reverting r12427
git-svn-id: http://skia.googlecode.com/svn/trunk@12428 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools/android/launcher/skia_launcher.cpp')
-rw-r--r-- | platform_tools/android/launcher/skia_launcher.cpp | 10 |
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"); |