[Android] Enable multidex for debug builds of ChromePublic.

base/base.gyp

Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 41d53792c1eabcb6ee75f6fd572c06674905508b..26c9cfa5aa59f0bd71bb0e45e0090012db340c5c 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -1454,6 +1454,7 @@
           'target_name': 'base_java',
           'type': 'none',
           'variables': {
+            'input_jars_paths': ['>@(multidex_disabled_jars_paths)'],
             'java_in_dir': 'android/java',
             'jar_excluded_classes': [ '*/NativeLibraries.class' ],
           },
@@ -1462,13 +1463,54 @@
             'base_java_library_load_from_apk_status_codes',
             'base_java_library_process_type',
             'base_java_memory_pressure_level',
+            'base_multidex_disabled_java',
             'base_native_libraries_gen',
-            '../third_party/android_tools/android_tools.gyp:android_support_multidex_javalib',
             '../third_party/jsr-305/jsr-305.gyp:jsr_305_javalib',
           ],
           'includes': [ '../build/java.gypi' ],
         },
         {
+          # GN: TODO(jbudorick): Enable this target in GN when adding GN
+          #   multidex support.
+          'target_name': 'base_multidex_enabled_java',

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

Curious why you made these into separate targets instead of using conditions +
additional_src_dirs?

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

these two targets are gone after implementing Yaron's suggestion.

+          'type': 'none',
+          'variables': {
+            'add_to_dependents_classpaths': 0,
+            'java_in_dir': 'android/multidex/java_enabled',
+          },
+          'dependencies': [
+            'base_java',
+            '../third_party/android_tools/android_tools.gyp:android_support_multidex_javalib',
+          ],
+          'all_dependent_settings': {
+            'variables': {
+              'multidex_enabled_jars_paths': [
+                '<(PRODUCT_DIR)/lib.java/base_multidex_enabled_java.jar',
+              ],
+            },
+          },
+          'includes': [ '../build/java.gypi' ],
+        },
+        {
+          # GN: TODO(jbudorick): Enable this target in GN when adding GN
+          #   multidex support.
+          'target_name': 'base_multidex_disabled_java',
+          'type': 'none',
+          'variables': {
+            'add_to_dependents_classpaths': 0,
+            'java_in_dir': 'android/multidex/java_disabled',
+          },
+          'dependencies': [],
+          'all_dependent_settings': {
+            'variables': {
+              'multidex_disabled_jars_paths': [
+                '<(PRODUCT_DIR)/lib.java/base_multidex_disabled_java.jar'
+              ],
+            },
+          },
+          'includes': [ '../build/java.gypi' ],
+        },
+        {
           # GN: //base:base_java_unittest_support
           'target_name': 'base_java_unittest_support',
           'type': 'none',
@@ -1513,9 +1555,11 @@
           'type': 'none',
           'dependencies': [
             'base_java',
+            'base_multidex_disabled_java',
             '../testing/android/on_device_instrumentation.gyp:reporter_java',
           ],
           'variables': {
+            'input_jars_paths': ['>@(multidex_disabled_jars_paths)'],
             'java_in_dir': '../base/test/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],