Revert of Add directory option for JUnit coverage files.

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.
 """
 
 import optparse
 import os
 import sys
 
 from util import build_utils
 
 # The java command must be executed in the current directory because there may
 # be user-supplied paths in the args. The script receives the classpath relative
 # to the directory that the script is written in and then, when run, must
 # recalculate the paths relative to the current directory.
 script_template = """\
 #!/usr/bin/env python
 #
 # This file was generated by build/android/gyp/create_java_binary_script.py
 
-import argparse
 import os
 import sys
 
 self_dir = os.path.dirname(__file__)
 classpath = [{classpath}]
 bootclasspath = [{bootclasspath}]
 extra_program_args = {extra_program_args}
 if os.getcwd() != self_dir:
   offset = os.path.relpath(self_dir, os.getcwd())
   classpath = [os.path.join(offset, p) for p in classpath]
   bootclasspath = [os.path.join(offset, p) for p in bootclasspath]
 java_cmd = ["java"]
-# This is a simple argparser for jvm and jar arguments.
-parser = argparse.ArgumentParser()
-parser.add_argument('--jar-args')
-parser.add_argument('--jvm-args')
-args = parser.parse_args(sys.argv[1:])
-if args.jvm_args:
-  jvm_arguments = args.jvm_args.strip('"').split()
-  java_cmd.extend(jvm_arguments)
 {noverify_flag}
 if bootclasspath:
     java_cmd.append("-Xbootclasspath/p:" + ":".join(bootclasspath))
 java_cmd.extend(
     ["-classpath", ":".join(classpath), "-enableassertions", \"{main_class}\"])
 java_cmd.extend(extra_program_args)
-jar_arguments = args.jar_args.strip('"').split()
-java_cmd.extend(jar_arguments)
+java_cmd.extend(sys.argv[1:])
 os.execvp("java", java_cmd)
 """
 
 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',
@@ skipping 36 matching lines @@
   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:]))