Enable NativeActivity based Android tests.

testing/android/native_test/BUILD.gn

Index: testing/android/native_test/BUILD.gn
diff --git a/testing/android/native_test/BUILD.gn b/testing/android/native_test/BUILD.gn
index 8ea6683fc74f5802372e574eaa3304159f7e8028..24919f7bcf96b0de133272c28cc0285404d8d6a0 100644
--- a/testing/android/native_test/BUILD.gn
+++ b/testing/android/native_test/BUILD.gn
@@ -35,6 +35,18 @@ source_set("native_test_native_code") {
   ]
 }
 
+jinja_template("native_test_activity") {

[Yaron, 2016/05/20 14:39:54]

rename native_test_java_activity to help make it clearer what the distinction is
from below

[ynovikov, 2016/05/26 03:16:15]

Done. Removed entirely.

+  input = "java/src/org/chromium/native_test/NativeTestActivity.java.jinja2"
+  output = "$target_gen_dir/$target_name/org/chromium/native_test/NativeTestActivity.java"
+  variables = [ "use_native_activity=false" ]
+}
+
+jinja_template("native_test_native_activity") {
+  input = "java/src/org/chromium/native_test/NativeTestActivity.java.jinja2"
+  output = "$target_gen_dir/$target_name/org/chromium/native_test/NativeTestActivity.java"
+  variables = [ "use_native_activity=true" ]
+}
+
 # GYP: //testing/android/native_test.gyp:native_test_java
 android_library("native_test_java") {
   testonly = true
@@ -43,10 +55,29 @@ android_library("native_test_java") {
     "//testing/android/appurify_support:appurify_support_java",
     "//testing/android/reporter:reporter_java",
   ]
+  java_deps = [ ":native_test_activity" ]
   srcjar_deps = [ "//base:base_native_libraries_gen" ]
   java_files = [
     "java/src/org/chromium/native_test/NativeBrowserTestActivity.java",
-    "java/src/org/chromium/native_test/NativeTestActivity.java",
+    "$target_gen_dir/native_test_activity/org/chromium/native_test/NativeTestActivity.java",
+    "java/src/org/chromium/native_test/NativeTestInstrumentationTestRunner.java",
+    "java/src/org/chromium/native_test/NativeUnitTestActivity.java",
+  ]
+  jar_excluded_patterns = [ "*/NativeLibraries.class" ]
+}
+
+android_library("native_test_native_activity_java") {
+  testonly = true
+  deps = [
+    "//base:base_java",
+    "//testing/android/appurify_support:appurify_support_java",
+    "//testing/android/reporter:reporter_java",
+  ]
+  java_deps = [ ":native_test_native_activity" ]
+  srcjar_deps = [ "//base:base_native_libraries_gen" ]
+  java_files = [
+    "java/src/org/chromium/native_test/NativeBrowserTestActivity.java",
+    "$target_gen_dir/native_test_native_activity/org/chromium/native_test/NativeTestActivity.java",
     "java/src/org/chromium/native_test/NativeTestInstrumentationTestRunner.java",
     "java/src/org/chromium/native_test/NativeUnitTestActivity.java",
   ]
@@ -55,8 +86,11 @@ android_library("native_test_java") {
 
 # GYP: //testing/android/native_test.gyp:native_test_jni_headers
 generate_jni("native_test_jni_headers") {
+  deps = [
+    ":native_test_activity",
+  ]
   sources = [
-    "java/src/org/chromium/native_test/NativeTestActivity.java",
+    "$target_gen_dir/native_test_activity/org/chromium/native_test/NativeTestActivity.java",
   ]
   jni_package = "testing"
 }