From d0f00ea2d60e8c82fd12650120f40ce899882a32 Mon Sep 17 00:00:00 2001 From: "dmazzoni@google.com" Date: Tue, 13 Aug 2013 18:40:38 +0000 Subject: Revert 217286 "Revert 217273 "Android: run dex with the --force-..." This is reverting the revert - it turns out to not be the cause of the test failure. > Revert 217273 "Android: run dex with the --force-jumbo switch." > > I think it caused Android tests such as this one to fail: > MinidumpWriterTest.MinidumpSizeLimit > > Either way, it was submitted without try jobs. Always run try jobs. > > > Android: run dex with the --force-jumbo switch. > > > > This is needed to merge dex files collectively containing more than 65536 > > strings. More details at > > https://code.google.com/p/android/issues/detail?id=40772 and in the bug. > > > > BUG=272064 > > R=andrewhayden@chromium.org > > > > Review URL: https://codereview.chromium.org/22950006 > > TBR=ppi@chromium.org > > Review URL: https://codereview.chromium.org/23096002 TBR=dmazzoni@chromium.org Review URL: https://codereview.chromium.org/23072005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217297 0039d316-1c4b-4281-b951-d872f2087c98 --- build/android/gyp/dex.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'build/android') diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py index 21e1183..c1e5869 100755 --- a/build/android/gyp/dex.py +++ b/build/android/gyp/dex.py @@ -15,7 +15,10 @@ 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 + + # 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( -- cgit v1.1