Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Unified Diff: trunk/src/build/android/gyp/dex.py

Issue 23096002: Revert 217273 "Android: run dex with the --force-jumbo switch." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/build/android/gyp/dex.py
===================================================================
--- trunk/src/build/android/gyp/dex.py (revision 217285)
+++ trunk/src/build/android/gyp/dex.py (working copy)
@@ -15,11 +15,8 @@
def DoDex(options, paths):
dx_binary = os.path.join(options.android_sdk_tools, 'dx')
+ dex_cmd = [dx_binary, '--dex', '--output', options.dex_path] + paths
- # See http://crbug.com/272064 for context on --force-jumbo.
- dex_cmd = [dx_binary, '--dex', '--force-jumbo', '--output',
- options.dex_path] + paths
-
record_path = '%s.md5.stamp' % options.dex_path
md5_check.CallAndRecordIfStale(
lambda: build_utils.CheckCallDie(dex_cmd, suppress_output=True),
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698