diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 17:49:52 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-13 17:49:52 +0000 |
| commit | dc3a0941282f17f965b7cef09325508520b599bc (patch) | |
| tree | 23f006a19d80d2e300e8790bac848a3057e84c7d /build/android | |
| parent | d142bb9cbe085236a3c538617d70413d82e08f9f (diff) | |
| download | chromium_src-dc3a0941282f17f965b7cef09325508520b599bc.zip chromium_src-dc3a0941282f17f965b7cef09325508520b599bc.tar.gz chromium_src-dc3a0941282f17f965b7cef09325508520b599bc.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
| -rwxr-xr-x | build/android/gyp/dex.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py index c1e5869..21e1183 100755 --- a/build/android/gyp/dex.py +++ b/build/android/gyp/dex.py @@ -15,10 +15,7 @@ from util import md5_check def DoDex(options, paths): dx_binary = os.path.join(options.android_sdk_tools, 'dx') - - # See http://crbug.com/272064 for context on --force-jumbo. - dex_cmd = [dx_binary, '--dex', '--force-jumbo', '--output', - options.dex_path] + paths + dex_cmd = [dx_binary, '--dex', '--output', options.dex_path] + paths record_path = '%s.md5.stamp' % options.dex_path md5_check.CallAndRecordIfStale( |