Index: platform_tools/android/launcher/skia_launcher.cpp |
diff --git a/platform_tools/android/launcher/skia_launcher.cpp b/platform_tools/android/launcher/skia_launcher.cpp |
index 6cd900cbe04e8693d65ebc2cb1fcbd5394bf8b07..f1dddb36276f13a0321f13bd9e5a79b918103266 100644 |
--- a/platform_tools/android/launcher/skia_launcher.cpp |
+++ b/platform_tools/android/launcher/skia_launcher.cpp |
@@ -67,11 +67,9 @@ int main(int argc, const char** argv) { |
return -1; |
} |
- void* skiaLibrary; |
- |
#if defined(SKIA_DLL) |
// load the local skia shared library |
- skiaLibrary = load_library(appLocation, "skia_android"); |
+ void* skiaLibrary = load_library(appLocation, "skia_android"); |
if (NULL == skiaLibrary) |
{ |
return -1; |
@@ -84,10 +82,6 @@ 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"); |