yet another build fix for skia_launcher

platform_tools/android/launcher/skia_launcher.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <dlfcn.h>
 #include <stdio.h>
 
@@ skipping 16 matching lines @@
         const char** argv) {
     return (*app_main)(argc, argv);
 }
 
 void* load_library(const char* appLocation, const char* libraryName)
 {
      // attempt to lookup the location of the shared libraries
     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;
     }
 
     // load the appropriate library
     void* appLibrary = dlopen(libraryLocation, RTLD_LOCAL | RTLD_LAZY);
     if (!appLibrary) {
         printf("ERROR: Unable to open the shared library.\n");
         printf("ERROR: %s", dlerror());
@@ skipping 13 matching lines @@
     }
 
     // attempt to lookup the location of the skia app
     const char* appLocation = "/data/data/com.skia";
     if (!file_exists(appLocation)) {
         printf("ERROR: Unable to find the com.skia app on the device.\n");
         return -1;
     }
 
     // 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;
     }
 
     // load the appropriate library
     void* appLibrary = load_library(appLocation, argv[1]);
     if (NULL == appLibrary) {
         return -1;
     }
 
     // find the address of the main function
     int (*app_main)(int, const char**);
     *(void **) (&app_main) = dlsym(appLibrary, "main");
 
     if (!app_main) {
         printf("ERROR: Unable to load the main function of the selected program.\n");
         printf("ERROR: %s\n", dlerror());
         return -1;
     }
 
     // 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);
     } else {
         printf("WARNING: Unable to redirect output to the console.\n");
         printf("WARNING: %s\n", dlerror());
     }
 
     // pass all additional arguments to the main function
     return launch_app(app_main, argc - 1, ++argv);
 }