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

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

Issue 15969009: yet another build fix for skia_launcher (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 7 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 | « no previous file | 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 16f4b3d7a8d3fda25b88eba27d48e956ccca1d4c..b2996f84ca019550127494fcbada12725cea5441 100644
--- a/platform_tools/android/launcher/skia_launcher.cpp
+++ b/platform_tools/android/launcher/skia_launcher.cpp
@@ -34,7 +34,7 @@ void* load_library(const char* appLocation, const char* libraryName)
char libraryLocation[100];
sprintf(libraryLocation, "%s/lib/lib%s.so", appLocation, libraryName);
if (!file_exists(libraryLocation)) {
- printf("ERROR: Unable to find the appropriate library in the Skia App.\n");
+ printf("ERROR: Unable to find the '%s' library in the Skia App.\n", libraryName);
printf("ERROR: Did you provide the correct program_name?\n");
usage();
return NULL;
@@ -68,7 +68,7 @@ int main(int argc, const char** argv) {
}
// load the local skia shared library
- void* skiaLibrary = load_library(appLocation, "libskia_android.so");
+ void* skiaLibrary = load_library(appLocation, "skia_android");
if (NULL == skiaLibrary)
{
return -1;
@@ -92,7 +92,7 @@ int main(int argc, const char** argv) {
// find the address of the SkPrintToConsole function
void (*app_SkDebugToStdOut)(bool);
- *(void **) (&app_SkDebugToStdOut) = dlsym(appLibrary, "AndroidSkDebugToStdOut");
+ *(void **) (&app_SkDebugToStdOut) = dlsym(skiaLibrary, "AndroidSkDebugToStdOut");
if (app_SkDebugToStdOut) {
(*app_SkDebugToStdOut)(true);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698