diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2014-07-11 16:02:57 +0200 |
|---|---|---|
| committer | mikaelpeltier <mikaelpeltier@google.com> | 2014-07-18 11:08:26 +0200 |
| commit | f9141d5433dcb74091d7f3121cc188fd754bb168 (patch) | |
| tree | 2df025f451722125bcf21c6760be3a9a4944a686 /build.xml | |
| parent | 323c168999becffac28632b15bb97a093a06bef2 (diff) | |
| download | toolchain_jack-f9141d5433dcb74091d7f3121cc188fd754bb168.tar.gz toolchain_jack-f9141d5433dcb74091d7f3121cc188fd754bb168.tar.bz2 toolchain_jack-f9141d5433dcb74091d7f3121cc188fd754bb168.zip | |
Add command line for dex comparator
- DexComparator automatically call DexAnnotationsComparator when using
command line.
- Update build.xml and android.mk to build an executable jar of dex
comparator.
Change-Id: Ib69c697fd7c25e22d3569e92b9c581b5c57242b3
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 33 |
1 files changed, 25 insertions, 8 deletions
@@ -41,7 +41,7 @@ junit4-lib-clean, junit4-clean, hamcrest-core-lib-clean, - dexcomparator-lib-clean, + dexcomparator-clean, dex-lib-clean, dx-ref-lib-clean" /> @@ -889,22 +889,22 @@ </target> - <!-- ******************* --> - <!-- dexcomparator-lib --> - <!-- ******************* --> + <!-- *************** --> + <!-- dexcomparator --> + <!-- *************** --> + <property name="dexcomparator.execname" value="dexcomparator.jar" /> <property name="dexcomparator.build.dir" value="${dexcomparator.dir}/build" /> <property name="dexcomparator.libs.dir" value="${dexcomparator.dir}/libs" /> <property name="dexcomparator.build.outdir" value="${dexcomparator.build.dir}/classes" /> <property name="dexcomparator.dist.dir" value="${dexcomparator.dir}/dist" /> - <property name="dexcomparator.libname" value="dexcomparator-lib.jar" /> - <target name="dexcomparator-lib-clean"> + <target name="dexcomparator-clean"> <delete dir="${dexcomparator.build.dir}" /> <delete dir="${dexcomparator.libs.dir}" /> <delete dir="${dexcomparator.dist.dir}" /> </target> - <target name="dexcomparator-lib" depends="dx-lib,dex-lib,jsr305-lib,guava-lib"> + <target name="dexcomparator-compile" depends="dx-lib,dex-lib,jsr305-lib,guava-lib,args4j-lib"> <!-- project layout --> <mkdir dir="${dexcomparator.build.outdir}"/> <mkdir dir="${dexcomparator.libs.dir}"/> @@ -915,7 +915,8 @@ <file name="${dx.dist.dir}/${dx.libname}" /> <file name="${dexlib.dist.dir}/${dexlib.libname}" /> <file name="${jsr305.dist.dir}/${jsr305.libname}" /> - <file name="${guava.dist.dir}/${guava.libname}" /> + <file name="${guava.dist.dir}/${guava.libname}" /> + <file name="${args4j.dist.dir}/${args4j.libname}" /> </filelist> </copy> <!-- compile --> @@ -929,6 +930,22 @@ </fileset> </classpath> </javac> + </target> + + <target name="dexcomparator" depends="dexcomparator-compile"> + <jar destfile="${dexcomparator.dist.dir}/${dexcomparator.execname}" + manifest="${dexcomparator.dir}/etc/manifest.txt" + basedir="${dexcomparator.build.outdir}" includes="**"> + <zipgroupfileset dir="${dexcomparator.dir}/libs" includes="**/*.jar" /> + </jar> + </target> + + <!-- ******************* --> + <!-- dexcomparator-lib --> + <!-- ******************* --> + <property name="dexcomparator.libname" value="dexcomparator-lib.jar" /> + + <target name="dexcomparator-lib" depends="dexcomparator-compile"> <!-- package --> <jar destfile="${dexcomparator.dist.dir}/${dexcomparator.libname}" basedir="${dexcomparator.build.outdir}" |