[Android] Add gyp support for multidex.

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 113 matching lines @@
     'strip_stamp': '<(intermediate_dir)/strip.stamp',
     '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',
-    'dex_path': '<(intermediate_dir)/classes.dex',
+    'enable_multidex%': 0,
     '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,
     'final_apk_path%': '<(PRODUCT_DIR)/apks/<(apk_name).apk',
     'final_apk_path_no_extension%': '<(PRODUCT_DIR)/apks/<(apk_name)',
     'final_abi_split_apk_path%': '<(PRODUCT_DIR)/apks/<(apk_name)-abi-<(android_app_abi).apk',
     'incomplete_apk_path': '<(intermediate_dir)/<(apk_name)-incomplete.apk',
     'apk_install_record': '<(intermediate_dir)/apk_install.record.stamp',
     'device_intermediate_dir': '/data/data/org.chromium.gyp_managed_install/<(_target_name)/<(CONFIGURATION_NAME)',
     'symlink_script_host_path': '<(intermediate_dir)/create_symlinks.sh',
     'symlink_script_device_path': '<(device_intermediate_dir)/create_symlinks.sh',
     'create_standalone_apk%': 1,
     'res_v14_skip%': 0,
     'variables': {
       'variables': {
         'native_lib_target%': '',
         'native_lib_version_name%': '',
         'use_chromium_linker%' : 0,
         'use_relocation_packer%' : 0,
         'enable_chromium_linker_tests%': 0,
         'is_test_apk%': 0,
         'unsigned_apk_path': '<(intermediate_dir)/<(apk_name)-unsigned.apk',
         'unsigned_abi_split_apk_path': '<(intermediate_dir)/<(apk_name)-abi-<(android_app_abi)-unsigned.apk',
         'create_abi_split%': 0,
+        'enable_multidex%': 0,
       },
       'unsigned_apk_path': '<(unsigned_apk_path)',
       'unsigned_abi_split_apk_path': '<(unsigned_abi_split_apk_path)',
       'create_abi_split%': '<(create_abi_split)',
       'conditions': [
         ['gyp_managed_install == 1 and native_lib_target != ""', {
           'conditions': [
             ['create_abi_split == 0', {
               'unsigned_standalone_apk_path': '<(intermediate_dir)/<(apk_name)-standalone-unsigned.apk',
             }, {
@@ skipping 13 matching lines @@
         },{
           'emma_instrument%': 0,
         }],
         # When using abi splits, the abi split is modified by
         # gyp_managed_install rather than the main .apk
         ['create_abi_split == 1', {
           'managed_input_apk_path': '<(unsigned_abi_split_apk_path)',
         }, {
           'managed_input_apk_path': '<(unsigned_apk_path)',
         }],
+        ['enable_multidex == 1', {
+          'dex_path': '<(intermediate_dir)/classes.dex.zip',
+        }, {
+          'dex_path': '<(intermediate_dir)/classes.dex',
+        }],
       ],
     },
     'native_lib_target%': '',
     'native_lib_version_name%': '',
     'use_chromium_linker%' : 0,
     'load_library_from_zip%' : 0,
     'use_relocation_packer%' : 0,
     'enable_chromium_linker_tests%': 0,
     'emma_instrument%': '<(emma_instrument)',
     'apk_package_native_libs_dir': '<(apk_package_native_libs_dir)',
     'unsigned_standalone_apk_path': '<(unsigned_standalone_apk_path)',
     'unsigned_apk_path': '<(unsigned_apk_path)',
     'unsigned_abi_split_apk_path': '<(unsigned_abi_split_apk_path)',
     'create_abi_split%': '<(create_abi_split)',
     'managed_input_apk_path': '<(managed_input_apk_path)',
     'libchromium_android_linker': 'libchromium_android_linker.>(android_product_extension)',
     'extra_native_libs': [],
     'native_lib_placeholder_stamp': '<(apk_package_native_libs_dir)/<(android_app_abi)/native_lib_placeholder.stamp',
     'native_lib_placeholders': [],
     'main_apk_name': '<(apk_name)',
+    'dex_path': '<(dex_path)',
     'enable_errorprone%': '0',
     'errorprone_exe_path': '<(PRODUCT_DIR)/bin.java/chromium_errorprone',
   },
   # Pass the jar path to the apk's "fake" jar target.  This would be better as
   # direct_dependent_settings, but a variable set by a direct_dependent_settings
   # cannot be lifted in a dependent to all_dependent_settings.
   'all_dependent_settings': {
     'conditions': [
       ['proguard_enabled == "true"', {
         'variables': {
@@ skipping 760 matching lines @@
         '--proguard-jar-path', '<(android_sdk_root)/tools/proguard/lib/proguard.jar',
 
         '--stamp', '<(obfuscate_stamp)',
 
         '>@(additional_obfuscate_options)',
       ],
     },
     {
       'action_name': 'dex_<(_target_name)',
       'variables': {
+        'dex_additional_options': [],
         'dex_input_paths': [
-          '>@(library_dexed_jars_paths)',
           '<(jar_path)',
         ],
         'output_path': '<(dex_path)',
         'proguard_enabled_input_path': '<(obfuscated_jar_path)',
       },
+      'conditions': [
+        ['enable_multidex == 1', {
+          'variables': {
+            'main_dex_rules_file': '<(DEPTH)/build/android/main_dex_classes.rules',

[Yaron, 2015/08/05 21:56:41]

Is this supposed to be added? It's not generated, is it?

[jbudorick, 2015/08/05 22:55:22]

Missed it because *.rules is in the .gitignore. Renamed to
main_dex_classes.flags and added.

+            'dex_additional_options': [
+              '--multi-dex',
+              '--main-dex-rules-file', '<(main_dex_rules_file)',
+            ],
+            'dex_input_paths': [
+              '>@(input_jars_paths)',
+            ],
+          },
+          'inputs': [
+            '<(main_dex_rules_file)',
+          ],
+        }, {
+          'variables': {
+            'dex_input_paths': [
+              '>@(library_dexed_jars_paths)',
+            ],
+          },
+        }]
+      ],
       'target_conditions': [
         ['emma_instrument != 0', {
           'variables': {
             'dex_no_locals': 1,
             'dex_input_paths': [
               '<(emma_device_jar)'
             ],
           },
         }],
         ['is_test_apk == 1 and tested_apk_dex_path != "/"', {
@@ skipping 41 matching lines @@
             'native_libs_dir': '<(apk_package_native_libs_dir)',
           }, {
             'native_libs_dir': '<(DEPTH)/build/android/ant/empty/res',
           }],
         ],
       },
       'includes': ['android/apkbuilder_action.gypi'],
     },
   ],
 }