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 | d898c5459b9117de55f1d48783b26c96367209dc (patch) | |
| tree | 6344ee77011b2a778243dab83498695d2842f88a | |
| parent | f3ccf597b84a756e9dddb2a0f51e7a5e0e1f0d7e (diff) | |
| download | gyp-d898c5459b9117de55f1d48783b26c96367209dc.tar.gz | |
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/gyp@10673 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | apptype_console.gypi | 1 | ||||
| -rw-r--r-- | most.gyp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/apptype_console.gypi b/apptype_console.gypi index a306193..9a5e8a7 100644 --- a/apptype_console.gypi +++ b/apptype_console.gypi @@ -15,6 +15,7 @@ [ 'skia_os == "android"', { 'dependencies': [ 'android_deps.gyp:Android_EntryPoint', + 'android_system.gyp:skia_launcher', ], }], [ 'skia_os == "nacl"', { @@ -22,7 +22,7 @@ ], 'conditions': [ ['skia_os == "android"', { - 'dependencies': [ 'android_system.gyp:SkiaAndroidApp' ], + 'dependencies': [ 'android_system.gyp:SampleApp_APK' ], }], ], }, |