From 5b39f5ba9c339d1e4dae391fee9ec1396feec180 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Mon, 2 Dec 2013 13:36:22 +0000 Subject: Sanitizing source files in Housekeeper-Nightly git-svn-id: http://skia.googlecode.com/svn/trunk@12427 2bbb7eff-a529-9590-31e7-b0007b416f81 --- platform_tools/android/launcher/skia_launcher.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'platform_tools/android/launcher') diff --git a/platform_tools/android/launcher/skia_launcher.cpp b/platform_tools/android/launcher/skia_launcher.cpp index 746d470a3c..718a7173da 100644 --- a/platform_tools/android/launcher/skia_launcher.cpp +++ b/platform_tools/android/launcher/skia_launcher.cpp @@ -67,16 +67,12 @@ 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; } -#endif // load the appropriate library void* appLibrary = load_library(appLocation, argv[1]); @@ -84,10 +80,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"); -- cgit v1.2.3