Add --test-jar arg to test_runner to explicitly specify its path.

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.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
@@ skipping 1328 matching lines @@
   # and (possibly) native libraries.
   #
   # Variables
   #   alternative_android_sdk_jar: The alternative android sdk jar used in
   #     proguard.
   #   android_aapt_path: Android aapt tool to replace default one to build
   #     resource.
   #   android_manifest: Path to AndroidManifest.xml.
   #   android_manifest_dep: Target that generates AndroidManifest (if applicable)
   #   chromium_code: If true, extra analysis warning/errors will be enabled.
-  #   create_dist_ijar: Whether to define the "${target_name}_dist_ijar" target
+  #   dist_ijar_path: Path to create "${target_name}_dist_ijar" target
   #     (used by instrumentation_test_apk).
   #   data_deps: List of dependencies needed at runtime. These will be built but
   #     won't change the generated .apk in any way (in fact they may be built
   #     after the .apk is).
   #   deps: List of dependencies. All Android java resources and libraries in the
   #     "transitive closure" of these dependencies will be included in the apk.
   #     Note: this "transitive closure" actually only includes such targets if
   #     they are depended on through android_library or android_resources targets
   #     (and so not through builtin targets like 'action', 'group', etc).
   #   install_script_name: Name of wrapper script (default=target_name).
@@ skipping 427 matching lines @@
         deps += [ "${invoker.apk_under_test}__java" ]
       }
       if (emma_coverage && !_emma_never_instrument) {
         deps += [ "//third_party/android_tools:emma_device_java" ]
       }
     }
 
     # TODO(cjhopman): This is only ever needed to calculate the list of tests to
     # run. See build/android/pylib/instrumentation/test_jar.py. We should be
     # able to just do that calculation at build time instead.
-    if (defined(invoker.create_dist_ijar) && invoker.create_dist_ijar) {
-      _dist_ijar_path = "$root_build_dir/test.lib.java/" +
-                        get_path_info(_final_apk_path, "name") + ".jar"
+    if (defined(invoker.dist_ijar_path)) {
+      _dist_ijar_path = invoker.dist_ijar_path
       action("${_template_name}_dist_ijar") {
         script = "//build/android/gyp/create_dist_jar.py"
         depfile = "$target_gen_dir/$target_name.d"
         inputs = [
           _build_config,
         ]
         outputs = [
           "${_dist_ijar_path}",
         ]
         data = [
@@ skipping 442 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") {
+    assert(defined(invoker.apk_name))
     testonly = true
     _apk_target_name = "${target_name}__apk"
     _test_runner_target_name = "${target_name}__test_runner_script"
     _install_script_name = "install_$target_name"
+    _dist_ijar_path =
+        "$root_build_dir/test.lib.java/" + invoker.apk_name + ".jar"
 
     test_runner_script(_test_runner_target_name) {
       forward_variables_from(invoker,
                              [
                                "additional_apks",
                                "apk_under_test",
                                "data",
                                "data_deps",
                                "deps",
                                "ignore_all_data_deps",
                                "public_deps",
                              ])
       test_name = invoker.target_name
       test_type = "instrumentation"
       apk_target = ":$_apk_target_name"
+      test_jar = _dist_ijar_path
     }
 
     test_runner_script("${_test_runner_target_name}_incremental") {
       forward_variables_from(invoker,
                              [
                                "additional_apks",
                                "apk_under_test",
                                "data",
                                "data_deps",
                                "deps",
                                "ignore_all_data_deps",
                                "public_deps",
                              ])
       test_name = "${invoker.target_name}_incremental"
       test_type = "instrumentation"
       apk_target = ":$_apk_target_name"
+      test_jar = _dist_ijar_path
       incremental_install = true
     }
 
     android_apk(_apk_target_name) {
       deps = []
       data_deps = []
       forward_variables_from(invoker, "*")
       install_script_name = _install_script_name
       deps += [ "//testing/android/broker:broker_java" ]
       data_deps += [
@@ skipping 10 matching lines @@
         # code and the test java code. This is to allow us to apply all ProGuard
         # optimizations that we ship with, but not have them break tests. The
         # apk under test will still have the same resources, assets, and
         # manifest, all of which are the ones used in the tests.
         if (!defined(invoker.proguard_configs)) {
           proguard_configs = []
         }
         proguard_configs += [ "//testing/android/proguard_for_test.flags" ]
       }
 
-      create_dist_ijar = true
+      dist_ijar_path = _dist_ijar_path
       if (defined(invoker.run_findbugs_override)) {
         # Only allow findbugs when there are java files.
         run_findbugs_override =
             invoker.run_findbugs_override && defined(invoker.java_files)
       }
     }
 
     group(target_name) {
       public_deps = [
         ":$_apk_target_name",
@@ skipping 423 matching lines @@
         # because in practice they seem to contain classes required to be in the
         # classpath.
         deps += _subjar_targets
       }
       if (defined(_res_target_name)) {
         deps += [ ":$_res_target_name" ]
       }
     }
   }
 }