| Index: build/android/gyp/create_java_binary_script.py
|
| diff --git a/build/android/gyp/create_java_binary_script.py b/build/android/gyp/create_java_binary_script.py
|
| index 2b6553d0bdaa8e16bee0da4aac746df805240218..d8af1bc684414428925003a74d52309f5b9ac91f 100755
|
| --- a/build/android/gyp/create_java_binary_script.py
|
| +++ b/build/android/gyp/create_java_binary_script.py
|
| @@ -25,6 +25,7 @@ script_template = """\
|
| #
|
| # This file was generated by build/android/gyp/create_java_binary_script.py
|
|
|
| +import argparse
|
| import os
|
| import sys
|
|
|
| @@ -37,13 +38,29 @@ if os.getcwd() != self_dir:
|
| 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')
|
| +
|
| +known_args, unknown_args = parser.parse_known_args(sys.argv[1:])
|
| +if known_args.jvm_args:
|
| + jvm_arguments = known_args.jvm_args.strip('"').split()
|
| + java_cmd.extend(jvm_arguments)
|
| +if known_args.jar_args:
|
| + jar_arguments = known_args.jar_args.strip('"').split()
|
| + if unknown_args:
|
| + raise Exception('There are unknown arguments')
|
| +else:
|
| + jar_arguments = unknown_args
|
| +
|
| {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)
|
| -java_cmd.extend(sys.argv[1:])
|
| +java_cmd.extend(jar_arguments)
|
| os.execvp("java", java_cmd)
|
| """
|
|
|
|
|