diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-10-16 12:06:02 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-10-16 18:10:52 -0700 |
| commit | dabcfba5bb53d8ca7c3e7508558cc060c0945b69 (patch) | |
| tree | c144bd90427f27a2dc5cbe07ed828ce25b63e401 /files | |
| parent | 77908982268f51c9bb6ea4535daf2058999cdc10 (diff) | |
| download | sdk-dabcfba5bb53d8ca7c3e7508558cc060c0945b69.zip sdk-dabcfba5bb53d8ca7c3e7508558cc060c0945b69.tar.gz sdk-dabcfba5bb53d8ca7c3e7508558cc060c0945b69.tar.bz2 | |
Add support for dex force jumbo.
Change-Id: I68188063f0a44af9d38c2a47a53684a68bf346c3
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/build.xml | 8 |
1 files changed, 8 insertions, 0 deletions
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" /> |