diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2014-10-20 14:42:32 +0200 |
|---|---|---|
| committer | Jean-Marie Henaff <jmhenaff@google.com> | 2014-10-20 14:42:32 +0200 |
| commit | 21a02eeac0b65ed5396890d33a230ae414241f0b (patch) | |
| tree | d1be8cb4c43ad81d25f1e5552000b99ea17093f4 /build.xml | |
| parent | b6907666f1164484158602a3690f09cba6c61c78 (diff) | |
| download | toolchain_jack-21a02eeac0b65ed5396890d33a230ae414241f0b.tar.gz toolchain_jack-21a02eeac0b65ed5396890d33a230ae414241f0b.tar.bz2 toolchain_jack-21a02eeac0b65ed5396890d33a230ae414241f0b.zip | |
Fix bug in build.xml that made first build crash
Change-Id: I4d818b92bda6e569cbf07b112717a30d4a6c64ff
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -44,6 +44,7 @@ hamcrest-core-lib-clean, dexcomparator-clean, dex-lib-clean, + ddm-lib-clean, dx-ref-lib-clean, core-stubs-mini-clean" /> @@ -298,6 +299,8 @@ <target name="jack-tests-clean"> <delete dir="${jack-tests.libs.dir}" /> + <delete dir="${jack-tests.build.outdir}" /> + <delete file="${jack-tests.dist.dir}/${jack-tests.libname}" /> </target> <target name="jack-tests-copy-libs" depends="core-stubs-mini,junit4,dx-ref-lib,ddm-lib,ecj, @@ -344,10 +347,7 @@ <exclude name="com/android/jack/lookup/test001/liboverride/**"/> <classpath> <filelist dir="/"> - <file name="${junit4.dist.dir}/${junit4.libname}" /> - <file name="${jack.dist.dir}/${jack.libname}" /> - <file name="${jackunittests.dist.dir}/${jackunittests.libname}" /> - <file name="${dexcomparator.dist.dir}/${dexcomparator.libname}" /> + <file name="${jackunittests.dist.dir}/${jackunittests.execname}" /> <file name="${ddm-lib.dist.dir}/${ddm-lib.libname}" /> </filelist> </classpath> @@ -416,7 +416,7 @@ <property name="ddm-lib.dist.dir" value="${ddm-lib.dir}/dist"/> <target name="ddm-lib-clean"> - <delete dir="${ddm-lib.dist.dir}"/> + <delete file="${ddm-lib.dist.dir}/${ddm-lib.libname}"/> </target> <target name="ddm-lib"> |