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

build/android/gyp/create_java_binary_script.py

 #!/usr/bin/env python
 #
 # 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.
 
 """Creates a simple script to run a java "binary".
 
 This creates a script that sets up the java command line for running a java
 jar. This includes correctly setting the classpath and the main class.
@@ skipping 12 matching lines @@
 script_template = """\
 #!/usr/bin/env python
 #
 # This file was generated by build/android/gyp/create_java_binary_script.py
 
 import os
 import sys
 
 self_dir = os.path.dirname(__file__)
 classpath = [{classpath}]
+extra_args = {extra_args}
 if os.getcwd() != self_dir:
   offset = os.path.relpath(self_dir, os.getcwd())
   classpath = [os.path.join(offset, p) for p in classpath]
 java_args = [
   "java",
   "-classpath", ":".join(classpath),
   "-enableassertions",
-  \"{main_class}\"] + sys.argv[1:]
+  \"{main_class}\"] + extra_args + sys.argv[1:]
 os.execvp("java", java_args)
 """
 
 def main(argv):
   argv = build_utils.ExpandFileArgs(argv)
   parser = optparse.OptionParser()
   build_utils.AddDepfileOption(parser)
   parser.add_option('--output', help='Output path for executable script.')
   parser.add_option('--jar-path', help='Path to the main jar.')
   parser.add_option('--main-class',
       help='Name of the java class with the "main" entry point.')
   parser.add_option('--classpath', action='append',
       help='Classpath for running the jar.')
-  options, _ = parser.parse_args(argv)
+  options, extra_args = parser.parse_args(argv)
 
   classpath = [options.jar_path]
   for cp_arg in options.classpath:
     classpath += build_utils.ParseGypList(cp_arg)
 
   run_dir = os.path.dirname(options.output)
   classpath = [os.path.relpath(p, run_dir) for p in classpath]
 
   with open(options.output, 'w') as script:
     script.write(script_template.format(
       classpath=('"%s"' % '", "'.join(classpath)),
-      main_class=options.main_class))
+      main_class=options.main_class,
+      extra_args=repr(extra_args)))
 
   os.chmod(options.output, 0750)
 
   if options.depfile:
     build_utils.WriteDepfile(
         options.depfile,
         build_utils.GetPythonDependencies())
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))