GN: Make the wrapper script generated for junit work without extra args

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")
 
 assert(is_android)
 
 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
 rebased_android_sdk_root = rebase_path(android_sdk_root, root_build_dir)
@@ skipping 102 matching lines @@
       rebase_path(jar_path, root_build_dir),
     ]
 
     if (findbugs_verbose) {
       args += [ "-vv" ]
     }
   }
 }
 
 # Generates a script in the output bin.java directory to run a java binary.
+#
+# Variables
+#   main_class: The class containing the progam entry point.
+#   jar_path: The path to the jar to run.
+#   script_name: Name of the script to generate.
+#   build_config: Path to .build_config for the jar (contains classpath).
+#   wrapper_script_args: List of extra arguments to pass to the executable.
+#
 template("java_binary_script") {
   set_sources_assignment_filter([])
   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) {
@@ skipping 13 matching lines @@
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--output",
       rebase_path(java_script, root_build_dir),
       "--classpath=@FileArg($_rebased_build_config:java:full_classpath)",
       "--jar-path",
       rebase_path(_jar_path, root_build_dir),
       "--main-class",
       _main_class,
     ]
+    if (defined(invoker.wrapper_script_args)) {
+      args += [ "--" ] + invoker.wrapper_script_args
+    }
   }
 }
 
 template("dex") {
   set_sources_assignment_filter([])
 
   assert(defined(invoker.output))
   action(target_name) {
     forward_variables_from(invoker,
                            [
@@ skipping 1115 matching lines @@
     chromium_code = _chromium_code
     android = _requires_android
 
     supports_android = _supports_android
     deps = build_config_deps
   }
 
   if (defined(invoker.main_class)) {
     _final_datadeps += [ ":${_template_name}__java_binary_script" ]
     java_binary_script("${_template_name}__java_binary_script") {
+      forward_variables_from(invoker,
+                             [
+                               "main_class",
+                               "wrapper_script_args",
+                             ])
       build_config = _build_config
       jar_path = _jar_path
-      main_class = invoker.main_class
       script_name = _template_name
       deps = build_config_deps
     }
   }
 
   if (_supports_android) {
     if (defined(invoker.chromium_code) && invoker.chromium_code) {
       _android_manifest = "//build/android/AndroidManifest.xml"
       if (defined(invoker.android_manifest)) {
         _android_manifest = invoker.android_manifest
@@ skipping 325 matching lines @@
     ]
     args = [
       "--depfile",
       rebase_path(depfile, root_build_dir),
       "--script-output-path",
       rebase_path(generated_script, root_build_dir),
     ]
     args += test_runner_args
   }
 }