Add VisualBenchTestActivity for instrumentation-testing VisualBench

BUG=skia:4093

Review URL: https://codereview.chromium.org/1295823004

5 files changed, 79 insertions, 6 deletions

diff --git a/platform_tools/android/apps/visualbench/build.gradle b/platform_tools/android/apps/visualbench/build.gradle
index 476d7ed66a..a5d1b2a12b 100644
--- a/platform_tools/android/apps/visualbench/build.gradle
+++ b/platform_tools/android/apps/visualbench/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.skia.visualbench"
-        minSdkVersion 9
+        minSdkVersion 19
         targetSdkVersion 19
         versionCode 1
         versionName "1.0"
@@ -43,4 +43,4 @@ android {
         }
         assembleTask.getAt(0).dependsOn buildNativeLib
     }
-}
\ No newline at end of file
+}
diff --git a/platform_tools/android/apps/visualbench/src/main/AndroidManifest.xml b/platform_tools/android/apps/visualbench/src/main/AndroidManifest.xml
index c15dee6e16..2bb9ecaa38 100644
--- a/platform_tools/android/apps/visualbench/src/main/AndroidManifest.xml
+++ b/platform_tools/android/apps/visualbench/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
           android:versionName="1.0">
 
     <!-- This is the platform API where NativeActivity was introduced. -->
-    <uses-sdk android:minSdkVersion="9" />
+    <uses-sdk android:minSdkVersion="19" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_ALL_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
diff --git a/platform_tools/android/apps/visualbench/src/main/java/com/skia/VisualBenchActivity.java b/platform_tools/android/apps/visualbench/src/main/java/com/skia/VisualBenchActivity.java
index 90f70bfe0a..a5d291f92a 100644
--- a/platform_tools/android/apps/visualbench/src/main/java/com/skia/VisualBenchActivity.java
+++ b/platform_tools/android/apps/visualbench/src/main/java/com/skia/VisualBenchActivity.java
@@ -7,11 +7,8 @@
 
 package com.skia;
 
-import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
 
diff --git a/platform_tools/android/apps/visualbench/src/main/java/com/skia/VisualBenchTestActivity.java b/platform_tools/android/apps/visualbench/src/main/java/com/skia/VisualBenchTestActivity.java
new file mode 100644
index 0000000000..3e2bfd867c
--- /dev/null
+++ b/platform_tools/android/apps/visualbench/src/main/java/com/skia/VisualBenchTestActivity.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+package com.skia;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.test.ActivityUnitTestCase;
+import android.util.Log;
+
+public class VisualBenchTestActivity extends ActivityUnitTestCase<VisualBenchActivity> {
+    private VisualBenchActivity mActivity;
+    private Instrumentation mInstrumentation;
+
+    public VisualBenchTestActivity() {
+        super(VisualBenchActivity.class);
+    }
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        mInstrumentation = getInstrumentation();
+    }
+
+    public void testVisualBench() throws InterruptedException {
+        String pkg = getInstrumentation().getTargetContext().getPackageName();
+        Intent intent = new Intent(getInstrumentation().getTargetContext(),
+                                   VisualBenchActivity.class);
+        intent.putExtra("cmdLineFlags", "");
+        mActivity = launchActivityWithIntent(pkg, VisualBenchActivity.class, intent);
+
+        assertNotNull("mActivity is null", mActivity);
+        Thread.sleep(5000);
+        while (!mActivity.isDestroyed()) {
+            Log.d("skiatest", "Waiting for subprocess to finish.");
+            Thread.sleep(1000);
+        }
+    }
+}
diff --git a/platform_tools/android/gyp/skia_android.gypi b/platform_tools/android/gyp/skia_android.gypi
index 47dbf7ac8c..92ee5ddd9d 100644
--- a/platform_tools/android/gyp/skia_android.gypi
+++ b/platform_tools/android/gyp/skia_android.gypi
@@ -175,5 +175,39 @@
         },
       ],
     },
+    {
+      'target_name': 'VisualBenchTest_APK',
+      'type': 'none',
+      'dependencies': [
+        'VisualBench_APK',
+      ],
+      '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/java/com/skia/VisualBenchTestActivity.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/outputs/apk/visualbench-<(android_variant)-debug-androidTest-unaligned.apk',
+          ],
+          'action': [
+            '<(android_base)/apps/gradlew',
+            ':visualbench:assemble<(android_variant)DebugAndroidTest',
+            '-p<(android_base)/apps/visualbench',
+            '-PsuppressNativeBuild',
+          ],
+        },
+      ],
+    },
   ],
 }