[Android] Make generated test scripts pass apk paths.

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/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 920 matching lines @@
     wrapper_script_args = [
       "-test-jars",
       "$target_name.jar",
     ]
     testonly = true
 
     deps += [
       "//testing/android/junit:junit_test_support",
       "//third_party/junit",
       "//third_party/mockito:mockito_java",
+      "//third_party/robolectric:android-all-4.3_r2-robolectric-0",
       "//third_party/robolectric:robolectric_java",
-      "//third_party/robolectric:android-all-4.3_r2-robolectric-0",
     ]
   }
 }
 
 # 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.
 #
@@ skipping 411 matching lines @@
   if (_proguard_enabled) {
     _proguard_jar_path = "$base_path.proguard.jar"
   }
 
   build_config_target = "${_template_name}__build_config"
   write_build_config(build_config_target) {
     forward_variables_from(invoker, [ "apk_under_test" ])
     type = "android_apk"
     jar_path = _jar_path
     dex_path = final_dex_path
+    apk_path = _final_apk_path
     resources_zip = resources_zip_path
     build_config = _build_config
     android_manifest = _android_manifest
 
     deps = _chromium_linker_dep + _android_manifest_deps
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
 
     proguard_enabled = _proguard_enabled
@@ skipping 136 matching lines @@
 
   if (_proguard_enabled) {
     _proguard_configs = [ _generated_proguard_config ]
     if (defined(invoker.proguard_configs)) {
       _proguard_configs += invoker.proguard_configs
     }
     _proguard_target = "${_template_name}__proguard"
     proguard(_proguard_target) {
       deps = [
         ":$build_config_target",
+        ":$java_target",
         ":$process_resources_target",
-        ":$java_target",
       ]
       inputs = [
                  _build_config,
                  _jar_path,
                ] + _proguard_configs
 
       output_jar_path = _proguard_jar_path
       rebased_proguard_configs = rebase_path(_proguard_configs, root_build_dir)
       args = [
         "--proguard-configs=$rebased_proguard_configs",
@@ skipping 159 matching lines @@
 
       version_code = _version_code
       version_name = _version_name
 
       keystore_name = _keystore_name
       keystore_path = _keystore_path
       keystore_password = _keystore_password
 
       native_libs_dir = _native_libs_dir
       deps = [
+        ":${_manifest_rule}",
         ":${_prepare_native_target_name}",
-        ":${_manifest_rule}",
       ]
       incremental_deps = deps
     }
   }
 
   _create_incremental_script_rule_name = "${_template_name}__incremental_script"
   action(_create_incremental_script_rule_name) {
     script = "//build/android/incremental_install/create_install_script.py"
     depfile = "$target_gen_dir/$target_name.d"
     deps = [
@@ skipping 40 matching lines @@
     data_deps = []
     forward_variables_from(invoker, [ "data_deps" ])
 
     # device/commands is used by the installer script to push files via .zip.
     data_deps += [ "//build/android/pylib/device/commands" ]
 
     # Since the _incremental.apk does not include use .so nor .dex from the
     # actual target, but instead loads them at runtime, we need to explicitly
     # depend on them here.
     public_deps = [
+      ":${_create_incremental_script_rule_name}",
       ":${_template_name}__create_incremental",
-      ":${_create_incremental_script_rule_name}",
       ":${java_target}",
     ]
     if (_native_libs != []) {
       public_deps += [ ":$_prepare_native_target_name" ]
     }
   }
 }
 
 # Declare an Android instrumentation test apk
 #
@@ skipping 32 matching lines @@
 #     apk_under_test = "Foo"
 #     java_files = [
 #       "android/org/chromium/foo/FooTestCase.java",
 #       "android/org/chromium/foo/FooExampleTest.java",
 #     ]
 #     deps = [
 #       ":foo_test_support_java"
 #     ]
 #   }
 template("instrumentation_test_apk") {
-  set_sources_assignment_filter([])
   testonly = true
-  _template_name = target_name
+  _apk_target_name = "${target_name}__apk"
+  _test_runner_target_name = "${target_name}__test_runner_script"
 
-  if (defined(invoker.apk_name)) {
-    test_runner_data_dep = [ ":${_template_name}__test_runner_script" ]
-    test_runner_script("${_template_name}__test_runner_script") {
-      forward_variables_from(invoker, [ "isolate_file" ])
-      test_name = invoker.target_name
-      test_type = "instrumentation"
-      test_apk = invoker.apk_name
-    }
+  test_runner_script(_test_runner_target_name) {
+    forward_variables_from(invoker, [ "isolate_file" ])
+    test_name = invoker.target_name
+    test_type = "instrumentation"
+    apk_target = ":$_apk_target_name"
   }
 
-  android_apk(target_name) {
+  android_apk(_apk_target_name) {
     deps = []
     data_deps = []
     forward_variables_from(invoker, "*")
+    deps += [ "//testing/android/broker:broker_java" ]
     data_deps += [
       "//testing/android/driver:driver_apk",
       "//tools/android/forwarder2",
       "//tools/android/md5sum",
     ]
-    if (defined(test_runner_data_dep)) {
-      data_deps += test_runner_data_dep
-    }
-    deps += [ "//testing/android/broker:broker_java" ]
     run_findbugs = false
   }
+
+  group(target_name) {
+    public_deps = [
+      ":$_apk_target_name",
+      ":$_test_runner_target_name",
+    ]
+  }
 }
 
 # Declare an Android gtest apk
 #
 # This target creates an Android apk for running gtest-based unittests.
 #
 # Variables
 #   deps: Specifies the dependencies of this target. These will be passed to
 #     the underlying android_apk invocation and should include the java and
 #     resource dependencies of the apk.
@@ skipping 303 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }