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/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 'platform_tools/android/gyp')
| -rw-r--r-- | platform_tools/android/gyp/dependencies.gypi | 3 | ||||
| -rw-r--r-- | platform_tools/android/gyp/skia_android.gypi | 27 |
2 files changed, 3 insertions, 27 deletions
diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi index 1ee62a0218..86e9145d58 100644 --- a/platform_tools/android/gyp/dependencies.gypi +++ b/platform_tools/android/gyp/dependencies.gypi @@ -213,9 +213,6 @@ }], ], }, - 'sources': [ - '../app/jni/com_skia_SkiaIntentService.cpp', - ], }, { # This target is a dependency for Skia Sample application which runs on diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi index fb0a50ac03..68a58da916 100644 --- a/platform_tools/android/gyp/skia_android.gypi +++ b/platform_tools/android/gyp/skia_android.gypi @@ -1,19 +1,11 @@ { 'targets': [ { - 'target_name': 'CopySkiaAppDeps', + 'target_name': 'CopySampleAppDeps', 'type': 'none', 'dependencies': [ 'skia_lib.gyp:skia_lib', 'SampleApp.gyp:SampleApp', - 'bench.gyp:bench', - 'gm.gyp:gm', - 'tests.gyp:tests', - 'pathops_unittest.gyp:pathops_unittest', - 'tools.gyp:bench_pictures', - 'tools.gyp:render_pictures', - 'tools.gyp:render_pdfs', - 'tools.gyp:skimage', ], 'variables': { 'conditions': [ @@ -47,15 +39,7 @@ { 'destination': '<(PRODUCT_DIR)/android/libs/<(android_arch)', 'files': [ - '<(PRODUCT_DIR)/lib.target/libbench.so', - '<(PRODUCT_DIR)/lib.target/libbench_pictures.so', - '<(PRODUCT_DIR)/lib.target/libgm.so', - '<(PRODUCT_DIR)/lib.target/librender_pdfs.so', - '<(PRODUCT_DIR)/lib.target/librender_pictures.so', '<(PRODUCT_DIR)/lib.target/libSampleApp.so', - '<(PRODUCT_DIR)/lib.target/libskimage.so', - '<(PRODUCT_DIR)/lib.target/libtests.so', - '<(PRODUCT_DIR)/lib.target/libpathops_unittest.so', '<(PRODUCT_DIR)/lib.target/gdbserver', '<(PRODUCT_DIR)/lib.target/libskia_android.so', ], @@ -70,11 +54,10 @@ ], }, { - 'target_name': 'SkiaAndroidApp', + 'target_name': 'SampleApp_APK', 'type': 'none', 'dependencies': [ - 'CopySkiaAppDeps', - 'skia_launcher', + 'CopySampleAppDeps', ], 'variables': { 'ANDROID_SDK_ROOT': '<!(echo $ANDROID_SDK_ROOT)' @@ -86,12 +69,8 @@ '<(android_base)/app/AndroidManifest.xml', '<(android_base)/app/build.xml', '<(android_base)/app/project.properties', - '<(android_base)/app/jni/com_skia_SkiaIntentService.h', - '<(android_base)/app/jni/com_skia_SkiaIntentService.cpp', '<(android_base)/app/jni/com_skia_SkiaSampleRenderer.h', '<(android_base)/app/jni/com_skia_SkiaSampleRenderer.cpp', - '<(android_base)/app/src/com/skia/SkiaReceiver.java', - '<(android_base)/app/src/com/skia/SkiaIntentService.java', '<(android_base)/app/src/com/skia/SkiaSampleActivity.java', '<(android_base)/app/src/com/skia/SkiaSampleRenderer.java', '<(android_base)/app/src/com/skia/SkiaSampleView.java', |