diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-08-23 14:42:33 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2010-08-23 15:09:00 -0700 |
| commit | 695bf7bd3e88d2fcd40ac7c02208c4ae602bd826 (patch) | |
| tree | a44ca28472c64209875bbbcf8390a9c8fa2f1c17 /files/ant | |
| parent | 2ec0c5e1cb49b46fe3ab03f3397b1dd354f6c004 (diff) | |
| download | sdk-695bf7bd3e88d2fcd40ac7c02208c4ae602bd826.zip sdk-695bf7bd3e88d2fcd40ac7c02208c4ae602bd826.tar.gz sdk-695bf7bd3e88d2fcd40ac7c02208c4ae602bd826.tar.bz2 | |
Improve capability of the post-compile target.
Make the dex target use a different property to read
the input folder for classes to dexify.
By default the new property has the same value but can
be overriden if a post-compile target modify (obfuscate)
code into a different location.
Merged from master into tools_r7
Change-Id: I1fe2fd2a2678d8c4354702250cea1481f74dd7cf
Diffstat (limited to 'files/ant')
| -rw-r--r-- | files/ant/ant_rules_r3.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/files/ant/ant_rules_r3.xml b/files/ant/ant_rules_r3.xml index 8876c7d..7848862 100644 --- a/files/ant/ant_rules_r3.xml +++ b/files/ant/ant_rules_r3.xml @@ -75,6 +75,7 @@ <property name="out.absolute.dir" location="${out.dir}" /> <property name="out.classes.dir" value="${out.absolute.dir}/classes" /> <property name="out.classes.absolute.dir" location="${out.classes.dir}" /> + <property name="out.dex.input.absolute.dir" value="${out.classes.absolute.dir}" /> <!-- Intermediate files --> <property name="dex.file.name" value="classes.dex" /> @@ -175,7 +176,7 @@ <arg value="--output=${intermediate.dex.file}" /> <extra-parameters /> <arg line="${verbose.option}" /> - <arg path="${out.classes.absolute.dir}" /> + <arg path="${out.dex.input.absolute.dir}" /> <fileset dir="${external.libs.absolute.dir}" includes="*.jar" /> <path refid="android.libraries.jars" /> <external-libs /> |