Android: run dex with the --force-jumbo switch.

build/android/gyp/dex.py

Index: build/android/gyp/dex.py
diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py
index 21e1183e872bacfd10094d05aea99449205a6927..71d4d43ff6b9637a784c803f77d5bb25d98d16f2 100755
--- a/build/android/gyp/dex.py
+++ b/build/android/gyp/dex.py
@@ -15,7 +15,8 @@ from util import md5_check
 
 def DoDex(options, paths):
   dx_binary = os.path.join(options.android_sdk_tools, 'dx')
-  dex_cmd = [dx_binary, '--dex', '--output', options.dex_path] + paths
+  dex_cmd = [dx_binary, '--dex', '--force-jumbo', '--output',

[Andrew Hayden (chromium.org), 2013/08/13 14:56:48]

Could we add a comment here with a link back to the crbug in case people are
wondering why we are turning on --force-jumbo? The other flags are all obvious,
but the need for this one isn't clear unless you happen to know the context of
the bug.

[ppi, 2013/08/13 15:05:57]

Done.

+             options.dex_path] + paths
 
   record_path = '%s.md5.stamp' % options.dex_path
   md5_check.CallAndRecordIfStale(