Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: platform_tools/android/launcher/skia_launcher.cpp

Issue 1898793004: Cleanup android build files and tools (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « platform_tools/android/gyp/dependencies.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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");
« no previous file with comments | « platform_tools/android/gyp/dependencies.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698