diff options
| author |  bungeman <bungeman@google.com> | 2015-07-31 06:33:21 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-07-31 06:33:21 -0700 |
| commit | 15bde1697a3edb9dee683fa638d464e07e460794 (patch) | |
| tree | 693203d50efed616e1917fbc9bc5c25ac3ee6db2 /platform_tools | |
| parent | 76cc6575a4c1fc46c426d61252233cd48990d10d (diff) | |
Fix repeat builds with Android.
Currently the SampleApp and VisualBench builds for Android don't work
for rebuilds. The code is re-built, but the apks are not. This
results from the use of a directory as 'output' and the action to
build the apk not depending on the copied libraries.
Review URL: https://codereview.chromium.org/1270643005
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/gyp/skia_android.gypi | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi index 18de5893f5..48908cb93b 100644 --- a/platform_tools/android/gyp/skia_android.gypi +++ b/platform_tools/android/gyp/skia_android.gypi @@ -86,9 +86,17 @@ '<(android_base)/apps/sample_app/src/main/java/com/skia/SkiaSampleActivity.java', '<(android_base)/apps/sample_app/src/main/java/com/skia/SkiaSampleRenderer.java', '<(android_base)/apps/sample_app/src/main/java/com/skia/SkiaSampleView.java', + '<(android_base)/apps/sample_app/src/main/libs/<(android_arch)/libSampleApp.so', + ], + 'conditions': [ + [ 'skia_shared_lib', { + 'inputs': [ + '<(android_base)/apps/sample_app/src/main/libs/<(android_arch)/libskia_android.so', + ], + }], ], 'outputs': [ - '<(android_base)/apps/sample_app/build', + '<(android_base)/apps/sample_app/build/outputs/apk/sample_app-arm-debug.apk', ], 'action': [ '<(android_base)/apps/gradlew', @@ -141,9 +149,17 @@ 'inputs': [ '<(android_base)/apps/visualbench/src/main/AndroidManifest.xml', '<(android_base)/apps/visualbench/src/main/java/com/skia/VisualBenchActivity.java', + '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/libvisualbench.so', + ], + 'conditions': [ + [ 'skia_shared_lib', { + 'inputs': [ + '<(android_base)/apps/visualbench/src/main/libs/<(android_arch)/libskia_android.so', + ], + }], ], 'outputs': [ - '<(android_base)/apps/visualbench/build', + '<(android_base)/apps/visualbench/build/outputs/apk/visualbench-arm-debug.apk', ], 'action': [ '<(android_base)/apps/gradlew', |