[Android] Make generated test scripts pass apk paths.

build/config/android/internal_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("//build/config/android/config.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
 
@@ skipping 434 matching lines @@
         ]
       }
 
       if (defined(invoker.proguard_enabled) && invoker.proguard_enabled) {
         args += [
           "--proguard-enabled",
           "--proguard-info",
           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)) {
       args += [
         "--srcjar",
         rebase_path(invoker.srcjar, root_build_dir),
       ]
     }
   }
 }
@@ skipping 58 matching lines @@
     input_jar = _output_jar_path
     output_jar = _output_ijar_path
     deps = [
       ":$_output_jar_target",
     ]
   }
 
   group(target_name) {
     forward_variables_from(invoker, [ "visibility" ])
     public_deps = [
+      ":$_output_jar_target",
       ":${target_name}__ijar",
-      ":$_output_jar_target",
     ]
   }
 }
 
 # Creates an unsigned .apk.
 #
 # Variables
 #   assets_build_config: Path to android_apk .build_config containing merged
 #       asset information.
 #   deps: Specifies the dependencies of this target.
@@ skipping 1202 matching lines @@
       "--output-directory",
       rebase_path(root_build_dir, root_build_dir),
     ]
     if (_test_type == "gtest") {
       assert(defined(invoker.test_suite))
       test_runner_args += [
         "--suite",
         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.")
     }
 
     if (defined(invoker.isolate_file)) {
       test_runner_args += [
         "--isolate-file-path",
         rebase_path(invoker.isolate_file, root_build_dir),
       ]
@@ skipping 16 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }