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

diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi
index 18de589..48908cb 100644 (file)
--- 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',