diff options
| author |  djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-12 12:30:04 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-12 12:30:04 +0000 |
| commit | cc95b1aeb8cbb9201712c9982d12149b0e0027f0 (patch) | |
| tree | dcb3eba827fe84f2c24bca6cf00a0f883a10e9ec /platform_tools/android/launcher | |
| parent | 36bb270c1e05020d7f8df3bf244309fb44a9fff3 (diff) | |
Update Skia Android tools.
This CL moves the skia_launcher out of the system/bin and into
/data/local/tmp; removes the need to package our shared libs in an
apk; and updates all the scripts to work in the new environment.
R=mtklein@google.com, scroggo@google.com
Review URL: https://codereview.chromium.org/22617002
git-svn-id: http://skia.googlecode.com/svn/trunk@10673 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools/android/launcher')
| -rw-r--r-- | platform_tools/android/launcher/skia_launcher.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/platform_tools/android/launcher/skia_launcher.cpp b/platform_tools/android/launcher/skia_launcher.cpp index b2996f84ca..718a7173da 100644 --- a/platform_tools/android/launcher/skia_launcher.cpp +++ b/platform_tools/android/launcher/skia_launcher.cpp @@ -32,7 +32,7 @@ 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); + sprintf(libraryLocation, "%s/lib%s.so", appLocation, libraryName); if (!file_exists(libraryLocation)) { printf("ERROR: Unable to find the '%s' library in the Skia App.\n", libraryName); printf("ERROR: Did you provide the correct program_name?\n"); @@ -61,9 +61,9 @@ int main(int argc, const char** argv) { } // attempt to lookup the location of the skia app - const char* appLocation = "/data/data/com.skia"; + const char* appLocation = "/data/local/tmp"; if (!file_exists(appLocation)) { - printf("ERROR: Unable to find the com.skia app on the device.\n"); + printf("ERROR: Unable to find /data/local/tmp on the device.\n"); return -1; } |