Revert 217286 "Revert 217273 "Android: run dex with the --force-..."

trunk/src/build/android/gyp/dex.py

 #!/usr/bin/env python
 #
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import fnmatch
 import optparse
 import os
 import sys
 
 from util import build_utils
 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(
       lambda: build_utils.CheckCallDie(dex_cmd, suppress_output=True),
       record_path=record_path,
       input_paths=paths,
       input_strings=dex_cmd)
 
   build_utils.Touch(options.dex_path)
 
@@ skipping 22 matching lines @@
 
   DoDex(options, paths)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))