From dabcfba5bb53d8ca7c3e7508558cc060c0945b69 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Tue, 16 Oct 2012 12:06:02 -0700
Subject: Add support for dex force jumbo.

Change-Id: I68188063f0a44af9d38c2a47a53684a68bf346c3
---
 files/ant/build.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'files/ant')

diff --git a/files/ant/build.xml b/files/ant/build.xml
index 9210c66..699fb58 100644
--- a/files/ant/build.xml
+++ b/files/ant/build.xml
@@ -58,6 +58,13 @@
     -->
     <property name="aapt.ignore.assets" value="" />
 
+    <!-- dex force jumbo options, to be used when dex merging fails with
+         UNEXPECTED TOP-LEVEL EXCEPTION: com.android.dx.util.DexException: Cannot handle conversion to jumbo index!
+           at com.android.dx.merge.InstructionTransformer.jumboCheck(InstructionTransformer.java:103)
+           ...
+    -->
+    <property name="dex.force.jumbo" value="false" />
+
     <!-- compilation options -->
     <property name="java.encoding" value="UTF-8" />
     <property name="java.target" value="1.5" />
@@ -277,6 +284,7 @@
                     output="${intermediate.dex.file}"
                     dexedlibs="${out.dexed.absolute.dir}"
                     nolocals="@{nolocals}"
+                    forceJumbo="${dex.force.jumbo}"
                     verbose="${verbose}">
                 <path path="${out.dex.input.absolute.dir}"/>
                 <path refid="out.dex.jar.input.ref" />
-- 
cgit v1.1