[Android] Enable multidex for debug builds of ChromePublic.

build/java_apk.gypi

 # Copyright (c) 2012 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.
 
 # This file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 59 matching lines @@
 #  java_in_dir_suffix - To override the /src suffix on java_in_dir.
 #  app_manifest_version_name - set the apps 'human readable' version number.
 #  app_manifest_version_code - set the apps version number.
 #  dependencies_locale_zip_alternative_paths - a list of paths that used to
 #    replace dependencies_locale_zip_paths of all_dependent_settings.
 {
   'variables': {
     'tested_apk_obfuscated_jar_path%': '/',
     'tested_apk_dex_path%': '/',
     'tested_apk_is_multidex%': 0,
+    'tested_apk_multidex_configuration_path%': '',
     'additional_input_paths': [],
     'additional_locale_input_paths': [],
     'create_density_splits%': 0,
     'language_splits': [],
     'library_jars_paths': [],
     'input_jars_paths': [],
     'library_dexed_jars_paths': [],
-    'main_dex_list_path': '<(intermediate_dir)/main_dex_list.txt',
-    'main_dex_list_paths': ['<(main_dex_list_path)'],
     'additional_src_dirs': [],
     'generated_src_dirs': [],
     'app_manifest_version_name%': '<(android_app_version_name)',
     'app_manifest_version_code%': '<(android_app_version_code)',
     # aapt generates this proguard.txt.
     'generated_proguard_file': '<(intermediate_dir)/proguard.txt',
     'proguard_enabled%': 'false',
     'debug_build_proguard_enabled%': 'false',
     'proguard_flags_paths': ['<(generated_proguard_file)'],
     'jar_name': 'chromium_apk_<(_target_name).jar',
@@ skipping 40 matching lines @@
     'stripped_libraries_dir': '<(intermediate_dir)/stripped_libraries',
     'strip_additional_stamp': '<(intermediate_dir)/strip_additional.stamp',
     'version_stamp': '<(intermediate_dir)/version.stamp',
     'javac_includes': [],
     'jar_excluded_classes': [],
     'javac_jar_path': '<(intermediate_dir)/<(_target_name).javac.jar',
     'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',
     'obfuscated_jar_path': '<(intermediate_dir)/obfuscated.jar',
     'test_jar_path': '<(PRODUCT_DIR)/test.lib.java/<(apk_name).jar',
     'enable_multidex%': 0,
+    'enable_multidex_configurations%': [],
+    'multidex_configuration_path': '<(intermediate_dir)/multidex_config.json',
+    'multidex_disabled_jars_paths%': [],
+    'multidex_enabled_jars_paths%': [],
+    'main_dex_list_path': '<(intermediate_dir)/main_dex_list.txt',
     'emma_device_jar': '<(android_sdk_root)/tools/lib/emma_device.jar',
     'android_manifest_path%': '<(java_in_dir)/AndroidManifest.xml',
     'split_android_manifest_path': '<(intermediate_dir)/split-manifests/<(android_app_abi)/AndroidManifest.xml',
     'push_stamp': '<(intermediate_dir)/push.stamp',
     'link_stamp': '<(intermediate_dir)/link.stamp',
     'resource_zip_path': '<(intermediate_dir)/<(_target_name).resources.zip',
     'shared_resources%': 0,
     'app_as_shared_library%': 0,
     'final_apk_path%': '<(PRODUCT_DIR)/apks/<(apk_name).apk',
     'final_apk_path_no_extension%': '<(PRODUCT_DIR)/apks/<(apk_name)',
@@ skipping 98 matching lines @@
         'variables': {
           'debug_build_proguard_enabled': 'true',
         }
       }],
     ],
     'variables': {
       'apk_output_jar_path': '<(jar_path)',
       'tested_apk_obfuscated_jar_path': '<(obfuscated_jar_path)',
       'tested_apk_dex_path': '<(dex_path)',
       'tested_apk_is_multidex': '<(enable_multidex)',
+      'tested_apk_multidex_configuration_path': '<(multidex_configuration_path)',
     },
   },
   'conditions': [
     ['resource_dir!=""', {
       'variables': {
         'resource_input_paths': [ '<!@(find <(resource_dir) -name "*")' ]
       },
     }],
     ['R_package != ""', {
       'variables': {
@@ skipping 225 matching lines @@
             '<@(placeholders)',
           ],
         },
       ],
       'conditions': [
         ['gyp_managed_install == 1', {
           'variables': {
             'libraries_top_dir': '<(intermediate_dir)/lib.stripped',
             'libraries_source_dir': '<(libraries_top_dir)/lib/<(android_app_abi)',
             'device_library_dir': '<(device_intermediate_dir)/lib.stripped',
-            'configuration_name': '<(CONFIGURATION_NAME)',
           },
           'dependencies': [
             '<(DEPTH)/build/android/setup.gyp:get_build_device_configurations',
             '<(DEPTH)/build/android/pylib/device/commands/commands.gyp:chromium_commands',
           ],
           'actions': [
             {
               'includes': ['../build/android/push_libraries.gypi'],
             },
             {
@@ skipping 217 matching lines @@
             'density_splits': 1,
           },
           'includes': [ 'android/finalize_splits_action.gypi']
         },
       ],
     }],
     ['is_test_apk == 1', {
       'dependencies': [
         '<(DEPTH)/build/android/pylib/device/commands/commands.gyp:chromium_commands',
         '<(DEPTH)/tools/android/android_tools.gyp:android_tools',
-      ]
+      ],
     }],
     ['run_findbugs == 1', {
       'actions': [
         {
           'action_name': 'findbugs_<(_target_name)',
           'message': 'Running findbugs on <(_target_name)',
           'variables': {
             'additional_findbugs_args': [],
             'findbugs_verbose%': 0,
           },
@@ skipping 18 matching lines @@
           'action': [
             'python', '<(DEPTH)/build/android/findbugs_diff.py',
             '--auxclasspath-gyp', '>(input_jars_paths)',
             '--stamp', '<(findbugs_stamp)',
             '<@(additional_findbugs_args)',
             '<(jar_path)',
           ],
         },
       ],
     }],
+    ['enable_multidex == 1', {
+      'actions': [
+        {
+          'action_name': 'main_dex_list_for_<(_target_name)',
+          'variables': {
+            'jar_paths': ['>@(input_jars_paths)', '<(javac_jar_path)'],
+            'output_path': '<(main_dex_list_path)',
+          },
+          'includes': [ 'android/main_dex_action.gypi' ],
+        },
+      ],
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base_multidex_enabled_java',
+      ],
+    }],
+  ],
+  'target_conditions': [
+    ['multidex_disabled_jars_paths != []', {
+      'actions': [
+        {
+          'action_name': 'configure_multidex_for_<(_target_name)',
+          'inputs': [
+            '<(DEPTH)/build/android/gyp/configure_multidex.py',
+            '>@(multidex_enabled_jars_paths)',
+            '>@(multidex_disabled_jars_paths)',
+          ],
+          'outputs': [
+            '<(multidex_configuration_path)',
+          ],
+          'variables': {
+            'additional_multidex_config_options': [],
+            'enabled_configurations': ['>@(enable_multidex_configurations)'],
+            'conditions': [
+              ['enable_multidex == 1', {
+                'additional_multidex_config_options': ['--enable-multidex'],
+              }],
+            ],
+            'target_conditions': [
+              ['multidex_enabled_jars_paths != []', {
+                'additional_multidex_config_options': [
+                  '--multidex-enabled-libs', '>(multidex_enabled_jars_paths)',

[agrieve, 2015/11/11 14:43:01]

nit: libs usually refers to native libs, can you call this
--multidex-enabled-jar-paths

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

Entirely gone after Yaron's cpp suggestion.

+                ],
+              }],
+              ['tested_apk_multidex_configuration_path == 1', {
+                'additional_multidex_config_options': [
+                  '--tested-apk-multidex-configuration-path',
+                  '>(tested_apk_multidex_configuration_path)',
+                ],
+              }],
+            ],
+          },
+          'action': [
+            'python', '<(DEPTH)/build/android/gyp/configure_multidex.py',
+            '--configuration-name', '<(CONFIGURATION_NAME)',
+            '--enabled-configurations', '<(enabled_configurations)',
+            '--multidex-configuration-path', '<(multidex_configuration_path)',
+            '--multidex-disabled-libs', '>(multidex_disabled_jars_paths)',
+            '>@(additional_multidex_config_options)',
+          ],
+        },
+      ],
+    }],
   ],
   'dependencies': [
     '<(DEPTH)/tools/android/md5sum/md5sum.gyp:md5sum',
   ],
   'actions': [
     {
       'action_name': 'process_resources',
       'message': 'processing resources for <(_target_name)',
       'variables': {
         'local_additional_input_paths': [
@@ skipping 129 matching lines @@
         '--javac-includes=<(javac_includes)',
         '--chromium-code=<(chromium_code)',
         '--jar-path=<(javac_jar_path)',
         '--jar-excluded-classes=<(jar_excluded_classes)',
         '--stamp=<(compile_stamp)',
         '<@(extra_args)',
         '>@(java_sources)',
       ],
     },
     {
-      'action_name': 'main_dex_list_for_<(_target_name)',
-      'variables': {
-        'jar_path': '<(javac_jar_path)',
-        'output_path': '<(main_dex_list_path)',
-      },
-      'includes': [ 'android/main_dex_action.gypi' ],
-    },
-    {
       'action_name': 'emma_instr_jar_<(_target_name)',
       'message': 'Instrumenting <(_target_name) jar',
       'variables': {
         'input_path': '<(javac_jar_path)',
         'output_path': '<(jar_path)',
         'stamp_path': '<(emma_instr_stamp)',
         'instr_type': 'jar',
       },
       'outputs': [
         '<(emma_instr_stamp)',
@@ skipping 60 matching lines @@
           '>@(input_jars_paths)',
           '<(jar_path)',
         ],
       },
       'conditions': [
         ['is_test_apk == 1', {
           'outputs': [
             '<(test_jar_path)',
           ],
         }],
+        ['enable_multidex == 1', {
+          'inputs': [
+            '<(main_dex_list_path)',
+          ],
+          'variables': {
+            'additional_obfuscate_options': [
+              '--main-dex-list-path', '<(main_dex_list_path)',
+            ],
+          },
+        }],
+      ],
+      'target_conditions': [
+        ['multidex_disabled_jars_paths != []', {
+          'variables': {
+            'additional_obfuscate_options': [
+              '--multidex-configuration-path', '>(multidex_configuration_path)',
+            ],
+          },
+          'inputs': [
+            '>(multidex_configuration_path)',
+          ],
+        }]
       ],
       'inputs': [
         '<(DEPTH)/build/android/gyp/apk_obfuscate.py',
         '<(DEPTH)/build/android/gyp/util/build_utils.py',
         '>@(proguard_flags_paths)',
         '>@(obfuscate_input_jars_paths)',
         '>@(additional_obfuscate_input_paths)',
         '<(emma_instr_stamp)',
       ],
       'outputs': [
@@ skipping 34 matching lines @@
       'variables': {
         'dex_additional_options': [],
         'dex_input_paths': [
           '<(jar_path)',
         ],
         'output_path': '<(dex_path)',
         'proguard_enabled_input_path': '<(obfuscated_jar_path)',
       },
       'conditions': [
         ['enable_multidex == 1', {
+          'inputs': [
+            '<(main_dex_list_path)',
+          ],
           'variables': {
-            'dex_additional_options': [
-              '--multi-dex',
-              '--main-dex-list-paths', '>@(main_dex_list_paths)',
-            ],
+            'dex_additional_options': ['--main-dex-list-path', '<(main_dex_list_path)'],
           },
-          'inputs': [
-            '>@(main_dex_list_paths)',
-          ],
-        }]
+        }],
       ],
       'target_conditions': [
         ['enable_multidex == 1 or tested_apk_is_multidex == 1', {
           'variables': {
             'dex_input_paths': [
               '>@(input_jars_paths)',
             ],
           },
+        }],
+        ['multidex_disabled_jars_paths != []', {
+          'variables': {
+            'dex_additional_options': [
+              '--multidex-configuration-path', '>(multidex_configuration_path)',
+            ],
+          },
+          'inputs': [
+            '>(multidex_configuration_path)',
+          ],
         }, {
           'variables': {
             'dex_input_paths': [
               '>@(library_dexed_jars_paths)',
             ],
           },
         }],
         ['emma_instrument != 0', {
           'variables': {
             'dex_no_locals': 1,
@@ skipping 53 matching lines @@
             'native_libs_dir': '<(apk_package_native_libs_dir)',
           }, {
             'native_libs_dir': '<(DEPTH)/build/android/ant/empty/res',
           }],
         ],
       },
       'includes': ['android/apkbuilder_action.gypi'],
     },
   ],
 }