diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-10-25 15:45:22 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-10-25 15:45:22 -0700 |
| commit | fccdb80681bb8033b2ab2be89701eb5fa1036821 (patch) | |
| tree | 33fca7c8a4b2f855328806cd0636e32a3d3bcd6f /files | |
| parent | e5f29a1ba2f3c1e38bf400194df44d036e6729a9 (diff) | |
| parent | 3a480e2d770105c302b0d14be411dbfde42349a5 (diff) | |
| download | sdk-fccdb80681bb8033b2ab2be89701eb5fa1036821.zip sdk-fccdb80681bb8033b2ab2be89701eb5fa1036821.tar.gz sdk-fccdb80681bb8033b2ab2be89701eb5fa1036821.tar.bz2 | |
merge from open-source master
Change-Id: Ia61cea62f72a18aea3d908c90c90af9a517ed659
Diffstat (limited to 'files')
| -rw-r--r-- | files/ant/main_rules.xml | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/files/ant/main_rules.xml b/files/ant/main_rules.xml index 83f2a63..f573f48 100644 --- a/files/ant/main_rules.xml +++ b/files/ant/main_rules.xml @@ -177,10 +177,23 @@ <element name="external-libs" optional="yes" /> <element name="extra-parameters" optional="yes" /> <sequential> - <!-- sets the input for dex. If a pre-dex task sets it to something else - this has no effect --> + <!-- sets the primary input for dex. If a pre-dex task sets it to + something else this has no effect --> <property name="out.dex.input.absolute.dir" value="${out.classes.absolute.dir}" /> + <!-- set the secondary dx input: the project (and library) jar files + If a pre-dex task sets it to something else this has no effect --> + <if> + <condition> + <isreference refid="out.dex.jar.input.ref" /> + </condition> + <else> + <path id="out.dex.jar.input.ref"> + <path refid="jar.libs.ref" /> + </path> + </else> + </if> + <echo>Converting compiled files and external libraries into ${intermediate.dex.file}...</echo> <apply executable="${dx}" failonerror="true" parallel="true"> <arg value="--dex" /> @@ -188,7 +201,7 @@ <extra-parameters /> <arg line="${verbose.option}" /> <arg path="${out.dex.input.absolute.dir}" /> - <path refid="jar.libs.ref" /> + <path refid="out.dex.jar.input.ref" /> <external-libs /> </apply> </sequential> @@ -535,6 +548,13 @@ <isset property="proguard.config" /> </and> </condition> + <if condition="${proguard.enabled}"> + <then> + <!-- Secondary dx input (jar files) is empty since all the + jar files will be in the obfuscated jar --> + <path id="out.dex.jar.input.ref" /> + </then> + </if> </target> <target name="-set-release-mode"> |