[Android] Make generated test scripts pass apk paths.

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 6e27ce4de82cc4e629fb40817d6f6b1c619d2c5a..dec366853c6ace7b3d2078854e00fed0a98bda99 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -938,8 +938,8 @@ template("junit_binary") {
       "//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",
+      "//third_party/robolectric:robolectric_java",
     ]
   }
 }
@@ -1371,6 +1371,7 @@ template("android_apk") {
     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
@@ -1527,8 +1528,8 @@ template("android_apk") {
     proguard(_proguard_target) {
       deps = [
         ":$build_config_target",
-        ":$process_resources_target",
         ":$java_target",
+        ":$process_resources_target",
       ]
       inputs = [
                  _build_config,
@@ -1708,8 +1709,8 @@ template("android_apk") {
 
       native_libs_dir = _native_libs_dir
       deps = [
-        ":${_prepare_native_target_name}",
         ":${_manifest_rule}",
+        ":${_prepare_native_target_name}",
       ]
       incremental_deps = deps
     }
@@ -1770,8 +1771,8 @@ template("android_apk") {
     # actual target, but instead loads them at runtime, we need to explicitly
     # depend on them here.
     public_deps = [
-      ":${_template_name}__create_incremental",
       ":${_create_incremental_script_rule_name}",
+      ":${_template_name}__create_incremental",
       ":${java_target}",
     ]
     if (_native_libs != []) {
@@ -1828,14 +1829,13 @@ template("instrumentation_test_apk") {
   testonly = true
   _template_name = target_name
 
-  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
-    }
+  build_config = "${target_gen_dir}/${target_name}.build_config"

[agrieve, 2015/11/19 19:50:51]

nit: call this _build_config here, and do an explicit build_config =
_build_config within test_runner_script so that it's obvious which template it
applies to.

Actually - might be better to have instrumentation_test derive this from
android_apk. Maybe pass android_apk_target as a parameter and use
get_label_info() to build its build_config path?

[jbudorick, 2015/11/20 03:16:23]

Done.
I'm not sure I follow how that would work, and even after playing around with
what I thought you meant I still felt a bit lost... I'd like to pull the
build_config up from the android_apk invocation below, but I don't see how
get_label_info (and its restricted set of whats) would help here. Care to
elaborate?

[agrieve, 2015/11/20 03:50:49]

Feel free to submit as-is, and I can have a look tomorrow to see if this is
possible. (otherwise I'll have a look tomorrow anyways :P)

[agrieve, 2015/11/20 16:25:18]

Okay, have a look at the instrumentation_test_apk and test_runner_script changes
here:
https://codereview.chromium.org/1462363002

(I patched yours in, made the changes, then uploaded)

+
+  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"
   }
 
   android_apk(target_name) {