[Android] Enable multidex for debug builds of ChromePublic.

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 json
 import logging
 import optparse
 import os
 import sys
 import tempfile
 import zipfile
 
 from util import build_utils
 
 
-def _CreateCombinedMainDexList(main_dex_list_paths):
-  main_dex_list = []
-  for m in main_dex_list_paths:
-    with open(m) as main_dex_list_file:
-      main_dex_list.extend(l for l in main_dex_list_file if l)
-  return '\n'.join(main_dex_list)
-
-
 def _RemoveUnwantedFilesFromZip(dex_path):
   iz = zipfile.ZipFile(dex_path, 'r')
   tmp_dex_path = '%s.tmp.zip' % dex_path
   oz = zipfile.ZipFile(tmp_dex_path, 'w', zipfile.ZIP_DEFLATED)
   for i in iz.namelist():
     if i.endswith('.dex'):
       oz.writestr(i, iz.read(i))
   os.remove(dex_path)
   os.rename(tmp_dex_path, dex_path)
 
@@ skipping 14 matching lines @@
                     help='The build CONFIGURATION_NAME.')
   parser.add_option('--proguard-enabled',
                     help='"true" if proguard is enabled.')
   parser.add_option('--debug-build-proguard-enabled',
                     help='"true" if proguard is enabled for debug build.')
   parser.add_option('--proguard-enabled-input-path',
                     help=('Path to dex in Release mode when proguard '
                           'is enabled.'))
   parser.add_option('--no-locals',
                     help='Exclude locals list from the dex file.')
-  parser.add_option('--multi-dex', default=False, action='store_true',
-                    help='Create multiple dex files.')
   parser.add_option('--incremental',
                     action='store_true',
                     help='Enable incremental builds when possible.')
   parser.add_option('--inputs', help='A list of additional input paths.')
   parser.add_option('--excluded-paths',
                     help='A list of paths to exclude from the dex file.')
-  parser.add_option('--main-dex-list-paths',
-                    help='A list of paths containing a list of the classes to '
+  parser.add_option('--main-dex-list-path',
+                    help='A file containing a list of the classes to '
                          'include in the main dex.')
+  parser.add_option('--multidex-configuration-path',
+                    help='A JSON file containing multidex build configuration.')
 
   options, paths = parser.parse_args(args)
 
   required_options = ('android_sdk_tools',)
   build_utils.CheckOptions(options, parser, required=required_options)
 
-  if options.multi_dex and not options.main_dex_list_paths:
-    logging.warning('--multi-dex is unused without --main-dex-list-paths')
+  options.multi_dex = False
+  if options.multidex_configuration_path:
+    with open(options.multidex_configuration_path) as multidex_config_file:
+      multidex_config = json.loads(multidex_config_file.read())
+    options.multi_dex = multidex_config.get('enabled', False)
+    multidex_libs = multidex_config.get('libs', [])
+  else:
     options.multi_dex = False

[Yaron, 2015/11/11 02:06:38]

Redundant?

[jbudorick, 2015/11/12 20:33:40]

It was. This logic got shuffled around once libs was no longer necessary.

-  elif options.main_dex_list_paths and not options.multi_dex:
-    logging.warning('--main-dex-list-paths is unused without --multi-dex')
 
-  if options.main_dex_list_paths:
-    options.main_dex_list_paths = build_utils.ParseGypList(
-        options.main_dex_list_paths)
+  if options.multi_dex and not options.main_dex_list_path:
+    logging.warning('multidex cannot be enabled without --main-dex-list-path')
+    options.multi_dex = False
+  elif options.main_dex_list_path and not options.multi_dex:
+    logging.warning('--main-dex-list-path is unused if multidex is not enabled')
+  elif options.multi_dex:
+    paths.extend(multidex_libs)
+
   if options.inputs:
     options.inputs = build_utils.ParseGypList(options.inputs)
   if options.excluded_paths:
     options.excluded_paths = build_utils.ParseGypList(options.excluded_paths)
 
   return options, paths
 
 
 def _AllSubpathsAreClassFiles(paths, changes):
   for path in paths:
     if any(not p.endswith('.class') for p in changes.IterChangedSubpaths(path)):
       return False
   return True
 
 
 def _RunDx(changes, options, dex_cmd, paths):
   with build_utils.TempDir() as classes_temp_dir:
     # --multi-dex is incompatible with --incremental.
     if options.multi_dex:
-      combined_main_dex_list = tempfile.NamedTemporaryFile(suffix='.txt')
-      combined_main_dex_list.write(
-          _CreateCombinedMainDexList(options.main_dex_list_paths))
-      combined_main_dex_list.flush()
-      dex_cmd.append('--main-dex-list=%s' % combined_main_dex_list.name)
+      dex_cmd.append('--main-dex-list=%s' % options.main_dex_list_path)
     else:
       # Use --incremental when .class files are added or modified (never when
       # removed).
       # --incremental tells dx to merge all newly dex'ed .class files with
       # what that already exist in the output dex file (existing classes are
       # replaced).
       if options.incremental and changes.AddedOrModifiedOnly():
         changed_inputs = set(changes.IterChangedPaths())
         changed_paths = [p for p in paths if p in changed_inputs]
         if not changed_paths:
@@ skipping 47 matching lines @@
   dx_binary = os.path.join(options.android_sdk_tools, 'dx')
   # See http://crbug.com/272064 for context on --force-jumbo.
   # See https://github.com/android/platform_dalvik/commit/dd140a22d for
   # --num-threads.
   dex_cmd = [dx_binary, '--num-threads=8', '--dex', '--force-jumbo',
              '--output', options.dex_path]
   if options.no_locals != '0':
     dex_cmd.append('--no-locals')
 
   if options.multi_dex:
-    input_paths.extend(options.main_dex_list_paths)
+    input_paths.append(options.main_dex_list_path)
     dex_cmd += [
       '--multi-dex',
       '--minimal-main-dex',
     ]
 
   output_paths = [
     options.dex_path,
     options.dex_path + '.inputs',
   ]
 
   # An escape hatch to be able to check if incremental dexing is causing
   # problems.
   force = int(os.environ.get('DISABLE_INCREMENTAL_DX', 0))
 
   build_utils.CallAndWriteDepfileIfStale(
       lambda changes: _OnStaleMd5(changes, options, dex_cmd, paths),
       options,
       input_paths=input_paths,
       input_strings=dex_cmd,
       output_paths=output_paths,
       force=force,
       pass_changes=True)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))