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

diff --git a/files/ant/ant_rules_r3.xml b/files/ant/ant_rules_r3.xml
index 8876c7d..7848862 100644 (file)
--- 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 />

diff --git a/templates/build.template b/templates/build.template
index d8bd709..7ab06c0 100644 (file)
--- a/templates/build.template
+++ b/templates/build.template
@@ -52,6 +52,10 @@
     </target>
     <target name="-pre-compile">
     </target>
+
+    [This is typically used for code obfuscation.
+     Compiled code location: ${out.classes.absolute.dir}
+     If this is not done in place, override ${out.dex.input.absolute.dir}]
     <target name="-post-compile">
     </target>
 -->