summaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorJean-Marie Hénaff <jmhenaff@google.com>2015-03-09 15:47:55 +0000
committerJean-Marie Henaff <jmhenaff@google.com>2015-03-09 17:20:39 +0100
commit3bc5d685e9d9b2d9eb50e12d00cce47972a62d22 (patch)
tree4923f0ac587fac4e1b8a3304fdded79ab4ce7d2b /build.xml
parent62b4de7231372a882f49b2389b34a438e900debf (diff)
downloadtoolchain_jack-3bc5d685e9d9b2d9eb50e12d00cce47972a62d22.zip
toolchain_jack-3bc5d685e9d9b2d9eb50e12d00cce47972a62d22.tar.gz
toolchain_jack-3bc5d685e9d9b2d9eb50e12d00cce47972a62d22.tar.bz2
Revert "Revert "Start using jack-api for jack API based test toolchains""
This reverts commit b43732ee3d9f9ffcd7595ab657e4c683a1751b3a. Change-Id: Id9fbfcd8f7aebca1136bfcbbf9e37359dc42a19d
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index 00ef129..0b0d062 100644
--- a/build.xml
+++ b/build.xml
@@ -365,10 +365,11 @@
<delete file="${jack-tests.dist.dir}/${jack-tests.libname}" />
</target>
- <target name="jack-tests-copy-libs" depends="junit4,dx-ref-lib,ddm-lib,ecj,
+ <target name="jack-tests-copy-libs" depends="jack-api-lib,junit4,dx-ref-lib,ddm-lib,ecj,
antlr-rt-lib,guava-lib,dex-lib,jsr305-lib,dexcomparator-lib">
<copy todir="${jack-tests.libs.dir}" flatten="true">
<filelist dir="/" >
+ <file name="${jack-api.dist.dir}/${jack-api.lib.name}"/>
<file name="${junit4.dist.dir}/${junit4.execname}"/>
<file name="${dx-ref.dist.dir}/${dx-ref.libname}"/>
<file name="${ddm-lib.dist.dir}/${ddm-lib.libname}"/>
@@ -410,6 +411,7 @@
<filelist dir="/">
<file name="${jackunittests.dist.dir}/${jackunittests.execname}" />
<file name="${ddm-lib.dist.dir}/${ddm-lib.libname}" />
+ <file name="${jack-api.dist.dir}/${jack-api.lib.name}"/>
</filelist>
</classpath>
</javac>