[Android] Make generated test scripts pass apk paths.

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 29b20889c27d4c772c97da774a1c0bd3c847827f..ce08da9541c628f6c2251fc4b754aae3163ab8d3 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -452,6 +452,11 @@ template("write_build_config") {
           rebase_path(invoker.proguard_info, root_build_dir),
         ]
       }
+
+      if (defined(invoker.apk_path)) {
+        rebased_apk_path = rebase_path(invoker.apk_path, root_build_dir)

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

nit: rebased_apk_path -> _rebased_apk_path 

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

Done.

+        args += [ "--apk-path=$rebased_apk_path" ]
+      }
     }
 
     if (defined(invoker.srcjar)) {
@@ -530,8 +535,8 @@ template("process_java_prebuilt") {
   group(target_name) {
     forward_variables_from(invoker, [ "visibility" ])
     public_deps = [
-      ":${target_name}__ijar",
       ":$_output_jar_target",
+      ":${target_name}__ijar",
     ]
   }
 }
@@ -1754,10 +1759,12 @@ template("test_runner_script") {
         invoker.test_suite,
       ]
     } else if (_test_type == "instrumentation") {
-      assert(defined(invoker.test_apk))
+      _rebased_build_config = rebase_path(invoker.build_config, root_build_dir)
       test_runner_args += [
         "--test-apk",
-        invoker.test_apk,
+        "@FileArg($_rebased_build_config:deps_info:apk_path)",
+        "--apk-under-test",
+        "@FileArg($_rebased_build_config:deps_info:tested_apk_path)",
       ]
     } else {
       assert(false, "Invalid test type: $_test_type.")