Index: build/android/gyp/javac.py |
diff --git a/build/android/gyp/javac.py b/build/android/gyp/javac.py |
index 5722fb1d97a72dfbd63d8b9d1d94c5f7ca69c62e..09e8237404d09955ba27bb7e32a6e9f71b48e4e4 100755 |
--- a/build/android/gyp/javac.py |
+++ b/build/android/gyp/javac.py |
@@ -197,6 +197,10 @@ def _OnStaleMd5(changes, options, javac_cmd, java_files, classpath_inputs): |
# being in a temp dir makes it unstable (breaks md5 stamping). |
cmd = javac_cmd + ['-d', classes_dir] + java_files |
+ if cmd[0].endswith('jmake'): |
+ jar_args = '"%s"' % ' '.join(cmd[1:]) |
+ cmd = [cmd[0], '--jar-args', jar_args] |
+ |
# JMake prints out some diagnostic logs that we want to ignore. |
# This assumes that all compiler output goes through stderr. |
stdout_filter = lambda s: '' |