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 /gyp | |
| 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 'gyp')
| -rw-r--r-- | gyp/apptype_console.gypi | 1 | ||||
| -rw-r--r-- | gyp/most.gyp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gyp/apptype_console.gypi b/gyp/apptype_console.gypi index a30619373b..9a5e8a73d1 100644 --- a/gyp/apptype_console.gypi +++ b/gyp/apptype_console.gypi @@ -15,6 +15,7 @@ [ 'skia_os == "android"', { 'dependencies': [ 'android_deps.gyp:Android_EntryPoint', + 'android_system.gyp:skia_launcher', ], }], [ 'skia_os == "nacl"', { diff --git a/gyp/most.gyp b/gyp/most.gyp index bc6810a518..cfe528e8d0 100644 --- a/gyp/most.gyp +++ b/gyp/most.gyp @@ -22,7 +22,7 @@ ], 'conditions': [ ['skia_os == "android"', { - 'dependencies': [ 'android_system.gyp:SkiaAndroidApp' ], + 'dependencies': [ 'android_system.gyp:SampleApp_APK' ], }], ], }, |