[Android] Add gyp support for multidex.

build/android/ant/apk-package.xml

Index: build/android/ant/apk-package.xml
diff --git a/build/android/ant/apk-package.xml b/build/android/ant/apk-package.xml
index e8b76f7e453064d56ef3ac2f4c3a3d44be1d7e57..e9e32da79d83cf6ae60845f31833f5e9900af210 100644
--- a/build/android/ant/apk-package.xml
+++ b/build/android/ant/apk-package.xml
@@ -54,6 +54,9 @@
   <property name="resource.package.file.name" value="${RESOURCE_PACKAGED_APK_NAME}" />
 
   <property name="intermediate.dex.file" location="${DEX_FILE_PATH}" />
+  <condition property="multidex.enabled" value="true">
+    <equals arg1="${MULTIDEX_ENABLED}" arg2="1"/>
+  </condition>
 
   <!-- Macro that enables passing a variable list of external jar files
        to ApkBuilder. -->
@@ -70,13 +73,32 @@
           hascode="${HAS_CODE}"
           previousBuildType="/"
           buildType="${build.is.packaging.debug}/${build.is.signing.debug}">
-        <dex path="${intermediate.dex.file}"/>
+        <dex path="${intermediate.dex.file}" />
         <nativefolder path="${native.libs.absolute.dir}" />
         <extra-jars/>
       </apkbuilder>
     </sequential>
   </macrodef>
 
+  <macrodef name="multidex-package-helper">
+    <element name="extra-jars" optional="yes" />
+    <sequential>
+      <apkbuilder
+          outfolder="${out.absolute.dir}"
+          resourcefile="${resource.package.file.name}"
+          apkfilepath="${out.packaged.file}"
+          debugpackaging="${build.is.packaging.debug}"
+          debugsigning="${build.is.signing.debug}"
+          verbose="${verbose}"
+          hascode="false"
+          previousBuildType="/"
+          buildType="${build.is.packaging.debug}/${build.is.signing.debug}">
+        <zip path="${intermediate.dex.file}" />
+        <nativefolder path="${native.libs.absolute.dir}" />
+        <extra-jars/>
+      </apkbuilder>
+    </sequential>
+  </macrodef>
 
   <!-- Packages the application. -->
   <target name="-package">
@@ -89,7 +111,16 @@
         </package-helper>
       </then>
       <else>
-        <package-helper />
+        <if condition="${multidex.enabled}">
+          <then>
+            <echo message="multidex enabled" />

[Yaron, 2015/08/13 20:12:10]

does this show actually show up? If so, please remove before landing

[jbudorick, 2015/08/14 21:01:21]

It does, e.g.:

[24/26] ACTION Packaging Chrome
[echo] multidex enabled

Removed.

+            <multidex-package-helper />
+          </then>
+          <else>
+            <echo message="multidex disabled" />
+            <package-helper />
+          </else>
+        </if>
       </else>
     </if>
   </target>