Enable NativeActivity based Android tests.

build/config/android/rules.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
@@ skipping 15 matching lines @@
 # Example
 #   generate_jni("foo_jni") {
 #     sources = [
 #       "android/java/src/org/chromium/foo/Foo.java",
 #       "android/java/src/org/chromium/foo/FooUtil.java",
 #     ]
 #     jni_package = "foo"
 #   }
 template("generate_jni") {
   set_sources_assignment_filter([])
-  forward_variables_from(invoker, [ "testonly" ])
+  forward_variables_from(invoker,
+                         [
+                           "testonly",
+                           "deps",

[agrieve, 2016/05/19 00:42:50]

Adding "deps" here makes it apply to all targets defined below. This is really
subtle, so could you add it explicitly to the targets rather than here?

[ynovikov, 2016/05/20 02:38:10]

Done.

+                         ])
 
   assert(defined(invoker.sources))
   assert(defined(invoker.jni_package))
   jni_package = invoker.jni_package
   base_output_dir = "${target_gen_dir}/${target_name}"
   package_output_dir = "${base_output_dir}/${jni_package}"
   jni_output_dir = "${package_output_dir}/jni"
 
   jni_generator_include = "//base/android/jni_generator/jni_generator_helper.h"
 
@@ skipping 27 matching lines @@
     # updated.
     include_dirs = [
       base_output_dir,
       package_output_dir,
     ]
   }
 
   group(target_name) {
     forward_variables_from(invoker,
                            [
-                             "deps",
                              "public_deps",
                              "visibility",
                            ])
     if (!defined(public_deps)) {
       public_deps = []
     }
     public_deps += [ ":$foreach_target_name" ]
     public_configs = [ ":jni_includes_${target_name}" ]
+    if (defined(invoker.deps)) {
+      deps += invoker.deps
+    }
   }
 }
 
 # Declare a jni target for a prebuilt jar
 #
 # This target generates the native jni bindings for a set of classes in a .jar.
 #
 # See base/android/jni_generator/jni_generator.py for more info about the
 # format of generating JNI bindings.
 #
@@ skipping 2002 matching lines @@
 #     target must be defined previously in the same file.
 #   unittests_binary: The basename of the library produced by the unittests_dep
 #     target. If unspecified, it assumes the name of the unittests_dep target
 #     (which will be correct unless that target specifies an "output_name".
 #     TODO(brettw) make this automatic by allowing get_target_outputs to
 #     support executables.
 #   apk_name: The name of the produced apk. If unspecified, it uses the name
 #             of the unittests_dep target postfixed with "_apk"
 #   use_default_launcher: Whether the default activity (NativeUnitTestActivity)
 #     should be used for launching tests.
+#   use_native_activity: Test implements ANativeActivity_onCreate().
 #
 # Example
 #   unittest_apk("foo_unittests_apk") {
 #     deps = [ ":foo_java", ":foo_resources" ]
 #     unittests_dep = ":foo_unittests"
 #   }
 template("unittest_apk") {
+  assert(defined(invoker.unittests_dep), "Need unittests_dep for $target_name")
+  _test_suite_name = get_label_info(invoker.unittests_dep, "name")
+
+  # This trivial assert is needed in case both unittests_binary and apk_name
+  # are defined, as otherwise _test_suite_name would not be used.
+  assert(_test_suite_name != "")
+
+  if (!defined(invoker.apk_name)) {
+    _apk_name = _test_suite_name
+  } else {
+    _apk_name = invoker.apk_name
+  }
+  _use_native_activity =
+      defined(invoker.use_native_activity) && invoker.use_native_activity
+
+  if (!defined(android_manifest)) {

[agrieve, 2016/05/19 00:42:50]

This should be "invoker.android_manifest" I think. (android_manifest is not
forwarded, so will always be !defined).

[ynovikov, 2016/05/20 02:38:10]

Done.

+    jinja_template("${target_name}_manifest") {
+      if (!defined(invoker.unittests_binary)) {
+        native_library_name = _test_suite_name
+      } else {
+        native_library_name = invoker.unittests_binary
+      }
+      input = "//testing/android/native_test/java/AndroidManifest.xml.jinja2"
+      output = "${root_gen_dir}/${_apk_name}_jinja/AndroidManifest.xml"

[agrieve, 2016/05/19 00:42:50]

Better to use $target_gen_dir/$target_name/ rather than
${root_gen_dir}/${_apk_name}_jinja/

You can then also git rid of _apk_name

[ynovikov, 2016/05/20 02:38:10]

Done.

+      variables = [
+        "is_component_build=${is_component_build}",
+        "native_library_name=${native_library_name}",
+        "use_native_activity=${_use_native_activity}",
+      ]
+    }
+  }
+
   android_apk(target_name) {
     set_sources_assignment_filter([])
     data_deps = []
     deps = []
     forward_variables_from(invoker, "*")
     testonly = true
 
-    assert(defined(unittests_dep), "Need unittests_dep for $target_name")
-
-    test_suite_name = get_label_info(unittests_dep, "name")
-
-    # This trivial assert is needed in case both unittests_binary and apk_name
-    # are defined, as otherwise test_suite_name would not be used.
-    assert(test_suite_name != "")
-
-    if (!defined(apk_name)) {
-      apk_name = test_suite_name
-    }
+    apk_name = _apk_name
 
     if (!defined(android_manifest)) {
+      deps += [ ":${target_name}_manifest" ]
       android_manifest =
-          "//testing/android/native_test/java/AndroidManifest.xml"
+          "${root_gen_dir}/${_apk_name}_jinja/AndroidManifest.xml"

[agrieve, 2016/05/19 00:42:50]

nit: Make a variable for this in the outer scope. e.g.: _android_manifest_path

[ynovikov, 2016/05/20 02:38:10]

Done.

     }
 
     if (!defined(unittests_binary)) {
-      unittests_binary = "lib${test_suite_name}${shlib_extension}"
+      unittests_binary = "lib${_test_suite_name}${shlib_extension}"
     }
 
     final_apk_path = "$root_build_dir/${apk_name}_apk/${apk_name}-debug.apk"
 
     if (!defined(use_default_launcher) || use_default_launcher) {
-      deps += [ "//testing/android/native_test:native_test_java" ]
+      if (_use_native_activity) {
+        deps +=
+            [ "//testing/android/native_test:native_test_native_activity_java" ]
+      } else {
+        deps += [ "//testing/android/native_test:native_test_java" ]
+      }
     }
     native_libs = [ unittests_binary ]
     deps += [
       "//base:base_java",
       "//testing/android/appurify_support:appurify_support_java",
       "//testing/android/reporter:reporter_java",
     ]
     data_deps += [
       "//build/android/pylib/remote/device/dummy:remote_device_dummy_apk",
       "//tools/android/md5sum",
@@ skipping 263 matching lines @@
       "--target",
       rebase_path(invoker.target, root_build_dir),
       "--output-directory",
       rebase_path(root_out_dir, root_build_dir),
     ]
     if (defined(invoker.flag_name)) {
       args += [ "--flag-name=${invoker.flag_name}" ]
     }
   }
 }