Update from https://crrev.com/327068

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("//tools/grit/grit_rule.gni")
 import("//tools/relocation_packer/config.gni")
 
@@ skipping 31 matching lines @@
   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"
 
   foreach_target_name = "${target_name}__jni_gen"
   action_foreach(foreach_target_name) {
     script = "//base/android/jni_generator/jni_generator.py"
     depfile = "$target_gen_dir/$target_name.{{source_name_part}}.d"
     sources = invoker.sources
-    inputs = [
-      jni_generator_include,
-    ]
     outputs = [
       depfile,
       "${jni_output_dir}/{{source_name_part}}_jni.h",
     ]
 
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--input_file={{source}}",
       "--optimize_generation=1",
       "--ptr_type=long",
       "--output_dir",
       rebase_path(jni_output_dir, root_build_dir),
       "--includes",
-      rebase_path(jni_generator_include, "//"),
+      rebase_path(jni_generator_include, jni_output_dir),
       "--native_exports_optional",
     ]
     if (defined(invoker.jni_generator_jarjar_file)) {
       args += [
         "--jarjar",
         rebase_path(jni_generator_jarjar_file, root_build_dir),
       ]
     }
   }
 
@@ skipping 79 matching lines @@
     classname = _classname_list[0]
     jni_target_name = "${target_name}__jni_${classname}"
     jni_actions += [ ":$jni_target_name" ]
     action(jni_target_name) {
       # The sources aren't compiled so don't check their dependencies.
       check_includes = false
       depfile = "$target_gen_dir/$target_name.d"
       script = "//base/android/jni_generator/jni_generator.py"
       sources = [
         jar_file,
-        jni_generator_include,
       ]
       outputs = [
         depfile,
         "${jni_output_dir}/${classname}_jni.h",
       ]
 
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--jar_file",
         rebase_path(jar_file, root_build_dir),
         "--input_file",
         class,
         "--optimize_generation=1",
         "--ptr_type=long",
         "--output_dir",
         rebase_path(jni_output_dir, root_build_dir),
         "--includes",
-        rebase_path(jni_generator_include, root_build_dir),
+        rebase_path(jni_generator_include, jni_output_dir),
         "--native_exports_optional",
       ]
     }
   }
 
   config("jni_includes_${target_name}") {
     include_dirs = [ base_output_dir ]
   }
 
   group(target_name) {
@@ skipping 527 matching lines @@
 #
 #   bypass_platform_checks: Disables checks about cross-platform (Java/Android)
 #     dependencies for this target. This will allow depending on an
 #     android_library target, for example.
 #
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
 #
 #   datadeps, testonly
 #
 # Example
-#   java_library("foo") {
+#   java_binary("foo") {
 #     java_files = [ "org/chromium/foo/FooMain.java" ]
 #     deps = [ ":bar_java" ]
 #     main_class = "org.chromium.foo.FooMain"
 #   }
 template("java_binary") {
   set_sources_assignment_filter([])
 
   # TODO(cjhopman): This should not act like a java_library for dependents (i.e.
   # dependents shouldn't get the jar in their classpath, etc.).
   java_library_impl(target_name) {
@@ skipping 22 matching lines @@
       bypass_platform_checks = invoker.bypass_platform_checks
     }
     if (defined(invoker.testonly)) {
       testonly = invoker.testonly
     }
 
     main_class = invoker.main_class
   }
 }
 
-# Declare an java library target
+# Declare a Junit executable target
+#
+# This target creates an executable from java code for running as a junit test
+# suite. The executable will be in the output folder's /bin/ directory.
 #
 # Variables
 #   deps: Specifies the dependencies of this target. Java targets in this list
+#     will be included in the executable (and the javac classpath).
+#
+#   java_files: List of .java files included in this library.
+#   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
+#     will be added to java_files and be included in this library.
+#   srcjars: List of srcjars to be included in this library, together with the
+#     ones obtained from srcjar_deps.
+#
+#   chromium_code: If true, extra analysis warning/errors will be enabled.
+#
+# Example
+#   junit_binary("foo") {
+#     java_files = [ "org/chromium/foo/FooTest.java" ]
+#     deps = [ ":bar_java" ]
+#   }
+template("junit_binary") {
+  set_sources_assignment_filter([])
+
+  java_binary(target_name) {
+    bypass_platform_checks = true
+    main_class = "org.chromium.testing.local.JunitTestMain"
+    testonly = true
+
+    if (defined(invoker.DEPRECATED_java_in_dir)) {
+      DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir
+    }
+    if (defined(invoker.chromium_code)) {
+      chromium_code = invoker.chromium_code
+    }
+    deps = [
+      "//testing/android/junit:junit_test_support",
+      "//third_party/junit",
+      "//third_party/mockito:mockito_java",
+      "//third_party/robolectric:robolectric_java",
+      "//third_party/robolectric:android-all-4.3_r2-robolectric-0",
+    ]
+    if (defined(invoker.deps)) {
+      deps += invoker.deps
+    }
+    if (defined(invoker.java_files)) {
+      java_files = invoker.java_files
+    }
+    if (defined(invoker.srcjar_deps)) {
+      srcjar_deps = invoker.srcjar_deps
+    }
+    if (defined(invoker.srcjars)) {
+      srcjars = invoker.srcjars
+    }
+  }
+}
+
+# Declare a java library target
+#
+# Variables
+#   deps: Specifies the dependencies of this target. Java targets in this list
 #     will be added to the javac classpath.
 #
 #   java_files: List of .java files included in this library.
 #   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
 #     will be added to java_files and be included in this library.
 #   srcjars: List of srcjars to be included in this library, together with the
 #     ones obtained from srcjar_deps.
 #   DEPRECATED_java_in_dir: Directory containing java files. All .java files in
 #     this directory will be included in the library. This is only supported to
 #     ease the gyp->gn conversion and will be removed in the future.
@@ skipping 74 matching lines @@
     if (defined(invoker.jar_path)) {
       jar_path = invoker.jar_path
     }
 
     if (defined(invoker.supports_android) && invoker.supports_android) {
       supports_android = true
     }
   }
 }
 
-# Declare an java library target for a prebuilt jar
+# Declare a java library target for a prebuilt jar
 #
 # Variables
 #   deps: Specifies the dependencies of this target. Java targets in this list
 #     will be added to the javac classpath.
 #   jar_path: Path to the prebuilt jar.
 #   proguard_preprocess: If true, proguard preprocessing will be run. This can
 #     be used to remove unwanted parts of the library.
 #   proguard_config: Path to the proguard config for preprocessing.
 #
 # Example
@@ skipping 212 matching lines @@
 #     (and so not through builtin targets like 'action', 'group', etc).
 #   java_files: List of .java files to include in the apk.
 #   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
 #      will be added to java_files and be included in this apk.
 #   apk_name: Name for final apk.
 #   final_apk_path: Path to final built apk. Default is
 #     $root_out_dir/apks/$apk_name.apk. Setting this will override apk_name.
 #   native_libs: List paths of native libraries to include in this apk. If these
 #     libraries depend on other shared_library targets, those dependencies will
 #     also be included in the apk.
+#   apk_under_test: For an instrumentation test apk, this is the target of the
+#     tested apk.
 #   testonly: Marks this target as "test-only".
 #
 #   DEPRECATED_java_in_dir: Directory containing java files. All .java files in
 #     this directory will be included in the library. This is only supported to
 #     ease the gyp->gn conversion and will be removed in the future.
 #
 # Example
 #   android_apk("foo_apk") {
 #     android_manifest = "AndroidManifest.xml"
 #     java_files = [
@@ skipping 11 matching lines @@
 #       native_lib_path
 #     ]
 #   }
 template("android_apk") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
 
   assert(defined(invoker.final_apk_path) || defined(invoker.apk_name))
+  assert(defined(invoker.android_manifest))
   gen_dir = "$target_gen_dir/$target_name"
   base_path = "$gen_dir/$target_name"
-  _build_config = "$base_path.build_config"
+  _build_config = "$target_gen_dir/$target_name.build_config"
   resources_zip_path = "$base_path.resources.zip"
   all_resources_zip_path = "$base_path.resources.all.zip"
   jar_path = "$base_path.jar"
   final_dex_path = "$gen_dir/classes.dex"
   _template_name = target_name
   _final_apk_path = ""
   if (defined(invoker.final_apk_path)) {
     _final_apk_path = invoker.final_apk_path
   } else if (defined(invoker.apk_name)) {
     _final_apk_path = "$root_build_dir/apks/" + invoker.apk_name + ".apk"
@@ skipping 62 matching lines @@
         invoker.enable_relocation_packing) {
       _enable_relocation_packing = true
     }
 
     _native_lib_version_name = ""
     if (defined(invoker.native_lib_version_name)) {
       _native_lib_version_name = invoker.native_lib_version_name
     }
   }
 
+  _android_manifest = invoker.android_manifest
   _rebased_build_config = rebase_path(_build_config, root_build_dir)
 
   write_build_config("${_template_name}__build_config") {
     type = "android_apk"
     dex_path = final_dex_path
     resources_zip = resources_zip_path
     build_config = _build_config
+    android_manifest = _android_manifest
 
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
 
+    if (defined(invoker.apk_under_test)) {
+      apk_under_test = invoker.apk_under_test
+    }
+
     native_libs = _native_libs
   }
 
   final_deps = []
 
   final_deps += [ ":${_template_name}__process_resources" ]
   process_resources("${_template_name}__process_resources") {
     srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
-    android_manifest = invoker.android_manifest
+    android_manifest = _android_manifest
     resource_dirs = [ "//build/android/ant/empty/res" ]
     zip_path = resources_zip_path
     generate_constant_ids = true
     build_config = _build_config
   }
   _srcjar_deps += [ ":${_template_name}__process_resources" ]
 
   if (_native_libs != []) {
     _enable_chromium_linker_tests = false
     if (defined(invoker.enable_chromium_linker_tests)) {
@@ skipping 25 matching lines @@
       }
     }
     _srcjar_deps += [ ":${_template_name}__native_libraries_java" ]
   }
 
   final_deps += [ ":${_template_name}__java" ]
   java_library_impl("${_template_name}__java") {
     supports_android = true
     requires_android = true
     override_build_config = _build_config
-    android_manifest = invoker.android_manifest
+    android_manifest = _android_manifest
     chromium_code = true
     if (defined(invoker.java_files)) {
       java_files = invoker.java_files
     } else if (defined(invoker.DEPRECATED_java_in_dir)) {
       DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir
     } else {
       java_files = []
     }
     srcjar_deps = _srcjar_deps
     dex_path = base_path + ".dex.jar"
@@ skipping 87 matching lines @@
         rebased_gdbserver = rebase_path([ android_gdbserver ], root_build_dir)
         inputs += [ android_gdbserver ]
         args += [ "--libraries=$rebased_gdbserver" ]
       }
     }
   }
 
   final_deps += [ ":${_template_name}__create" ]
   create_apk("${_template_name}__create") {
     apk_path = _final_apk_path
-    android_manifest = invoker.android_manifest
+    android_manifest = _android_manifest
     resources_zip = all_resources_zip_path
     dex_path = final_dex_path
     load_library_from_apk = _load_library_from_apk
 
     version_code = "1"
     if (defined(invoker.version_code)) {
       version_code = invoker.version_code
     }
 
     version_name = "Developer Build"
@@ skipping 72 matching lines @@
     unittests_binary = "lib" + test_suite_name + ".so"
   }
 
   if (defined(invoker.apk_name)) {
     apk_name = invoker.apk_name
   } else {
     apk_name = test_suite_name
   }
 
   android_apk(target_name) {
-    _apk_name = apk_name
-    final_apk_path = "$root_build_dir/${_apk_name}_apk/${_apk_name}-debug.apk"
+    final_apk_path = "$root_build_dir/${apk_name}_apk/${apk_name}-debug.apk"
     java_files = [
-      "//testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java",
-      "//testing/android/java/src/org/chromium/native_test/ChromeNativeTestInstrumentationTestRunner.java",
+      "//testing/android/native_test/java/src/org/chromium/native_test/ChromeNativeTestActivity.java",
+      "//testing/android/native_test/java/src/org/chromium/native_test/ChromeNativeTestInstrumentationTestRunner.java",
     ]
-    android_manifest = "//testing/android/java/AndroidManifest.xml"
+    android_manifest = "//testing/android/native_test/java/AndroidManifest.xml"
     native_libs = [ unittests_binary ]
     if (defined(invoker.asset_location)) {
       asset_location = invoker.asset_location
     }
     deps = [
       "//base:base_java",
       "//build/android/pylib/remote/device/dummy:remote_device_dummy_apk",
     ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
@@ skipping 230 matching lines @@
 template("uiautomator_test") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }