Chromium Code Reviews| 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..7dae355f649f1334026b4941d2ff23a1106eb203 100755 |
| --- a/build/android/gyp/create_java_binary_script.py |
| +++ b/build/android/gyp/create_java_binary_script.py |
| @@ -37,13 +37,16 @@ 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"] |
| +jvm_arguments = [ x for x in sys.argv[1:] if x.startswith('-D')] |
|
BigBossZhiling
2016/05/07 01:12:01
'-D' I think is the conventional prefix of jvm arg
|
| +jar_arguments = [ x for x in sys.argv[1:] if not x.startswith('-D')] |
| +java_cmd.extend(jvm_arguments) |
|
jbudorick
2016/05/09 18:08:08
Why is this split necessary?
|
| {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) |
| """ |