[Android] Fix generated scripts for junit tests.

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/sanitizers/sanitizers.gni")
 import("//build/config/zip.gni")
 import("//third_party/ijar/ijar.gni")
 
 assert(is_android)
@@ skipping 180 matching lines @@
   forward_variables_from(invoker, [ "testonly" ])
 
   _main_class = invoker.main_class
   _build_config = invoker.build_config
   _jar_path = invoker.jar_path
   _script_name = invoker.script_name
 
   action(target_name) {
     script = "//build/android/gyp/create_java_binary_script.py"
     depfile = "$target_gen_dir/$_script_name.d"
-    java_script = "$root_build_dir/bin/$_script_name"
+    java_script = "$root_build_dir/bin/helper/$_script_name"
     inputs = [
       _build_config,
     ]
     outputs = [
       depfile,
       java_script,
     ]
     forward_variables_from(invoker, [ "deps" ])
     _rebased_build_config = rebase_path(_build_config, root_build_dir)
     args = [
@@ skipping 1076 matching lines @@
     java_binary_script(_binary_script_target_name) {
       forward_variables_from(invoker,
                              [
                                "bootclasspath",
                                "main_class",
                                "wrapper_script_args",
                              ])
       build_config = _build_config
       jar_path = _jar_path
       script_name = _template_name
+      if (defined(invoker.wrapper_script_name)) {
+        script_name = invoker.wrapper_script_name
+      }
       deps = [
         ":$_build_config_target_name",
       ]
     }
   }
 
   group(target_name) {
     forward_variables_from(invoker, [ "data_deps" ])
     deps = [
       ":$_ijar_target_name",
@@ skipping 217 matching lines @@
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
 
   assert(
       defined(invoker.java_files) || defined(invoker.DEPRECATED_java_in_dir) ||
       defined(invoker.srcjars) || defined(invoker.srcjar_deps))
   _base_path = "$target_gen_dir/$target_name"
 
   # Jar files can be needed at runtime (by Robolectric tests or java binaries),
   # so do not put them under gen/.
+  _jar_name = target_name
+  if (defined(invoker.jar_name)) {
+    _jar_name = invoker.jar_name
+  }
   target_dir_name = get_label_info(":$target_name", "dir")
-  _jar_path = "$root_out_dir/lib.java$target_dir_name/$target_name.jar"
+  _jar_path = "$root_out_dir/lib.java$target_dir_name/$_jar_name.jar"
   if (defined(invoker.jar_path)) {
     _jar_path = invoker.jar_path
   }
   _template_name = target_name
 
   _final_deps = []
   _final_datadeps = []
   if (defined(invoker.datadeps)) {
     _final_datadeps = invoker.datadeps
   }
@@ skipping 134 matching lines @@
     java_binary_script("${_template_name}__java_binary_script") {
       forward_variables_from(invoker,
                              [
                                "bootclasspath",
                                "main_class",
                                "wrapper_script_args",
                              ])
       build_config = _build_config
       jar_path = _jar_path
       script_name = _template_name
+      if (defined(invoker.wrapper_script_name)) {
+        script_name = invoker.wrapper_script_name
+      }
       deps = build_config_deps
     }
   }
 
   if (_supports_android) {
     if (defined(invoker.chromium_code) && invoker.chromium_code) {
       _final_datadeps += [ ":${_template_name}__lint" ]
       android_lint("${_template_name}__lint") {
         android_manifest = _android_manifest
         jar_path = _jar_path
@@ skipping 361 matching lines @@
         "@FileArg($_rebased_build_config:deps_info:tested_apk_path)",
       ]
       if (emma_coverage) {
         # Set a default coverage output directory (can be overridden by user
         # passing the same flag).
         test_runner_args += [
           "--coverage-dir",
           rebase_path("$root_out_dir/coverage", root_build_dir),
         ]
       }
+    } else if (_test_type == "junit") {
+      assert(defined(invoker.test_suite))
+      test_runner_args += [
+        "--test-suite",
+        invoker.test_suite,
+      ]
     } else {
       assert(false, "Invalid test type: $_test_type.")
     }
 
     if (defined(invoker.additional_apks)) {
       foreach(additional_apk, invoker.additional_apks) {
         deps += [ "${additional_apk}__build_config" ]
         _build_config = get_label_info(additional_apk, "target_gen_dir") + "/" +
                         get_label_info(additional_apk, "name") + ".build_config"
         _rebased_build_config = rebase_path(_build_config, root_build_dir)
@@ skipping 26 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }