Index: build/android/gyp/dex.py |
diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py |
index 87e9b06bcd878ef727cb87a4dfbc88d5e5734b47..5359c8fd0dd897c7cd9afb3870d3437688b42ddc 100755 |
--- a/build/android/gyp/dex.py |
+++ b/build/android/gyp/dex.py |
@@ -211,7 +211,8 @@ def main(args): |
# See http://crbug.com/272064 for context on --force-jumbo. |
# See https://github.com/android/platform_dalvik/commit/dd140a22d for |
# --num-threads. |
- dex_cmd = [dx_binary, '--num-threads=8', '--dex', '--force-jumbo', |
+ # See http://crbug.com/658782 for why -JXmx2G was added. |
+ dex_cmd = [dx_binary, '-JXmx2G', '--num-threads=8', '--dex', '--force-jumbo', |
jbudorick
2016/10/24 20:46:06
JX?
agrieve
2016/10/24 20:47:34
Yeah, it's because "dx" is a bash script that wrap
jbudorick
2016/10/24 20:48:35
sgtm
|
'--output', options.dex_path] |
if options.no_locals != '0': |
dex_cmd.append('--no-locals') |