Fix repeat builds with Android.

platform_tools/android/gyp/skia_android.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This GYP file stores the dependencies necessary to build Skia on the Android
 # platform. The OS doesn't provide many stable libraries as part of the
 # distribution so we have to build a few of them ourselves.
 #
 {
@@ skipping 68 matching lines @@
       'actions': [
         {
           'action_name': 'SampleApp_apk',
           'inputs': [
             '<(android_base)/apps/sample_app/src/main/AndroidManifest.xml',
             '<(android_base)/apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.h',
             '<(android_base)/apps/sample_app/src/main/jni/com_skia_SkiaSampleRenderer.cpp',
             '<(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',

[hal.canary, 2015/07/31 14:28:57]

arch-specific?

           ],
           'action': [
             '<(android_base)/apps/gradlew',
             ':sample_app:assemble<(android_variant)Debug',
             '-p<(android_base)/apps/sample_app',
             '-PsuppressNativeBuild',
           ],
         },
       ],
     },
@@ skipping 32 matching lines @@
       'type': 'none',
       'dependencies': [
         'CopyVisualBenchDeps',
       ],
       'actions': [
         {
           'action_name': 'SkiaVisualBench_apk',
           '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',
             ':visualbench:assemble<(android_variant)Debug',
             '-p<(android_base)/apps/visualbench',
             '-PsuppressNativeBuild',
           ],
         },
       ],
     },
   ],
 }