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: http://src.chromium.org/svn/trunk/src/build@217286 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
dmazzoni@chromium.org 2013-08-13 17:49:52 +00:00
Родитель 10c2681249
Коммит 597638d2f1
1 изменённых файлов: 1 добавлений и 4 удалений

Просмотреть файл

@ -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(