summaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2015-03-18 14:17:58 +0100
committerYohann Roussel <yroussel@google.com>2015-03-19 12:03:26 +0100
commit61eb97c58c3dcffbfb1498031e944a9ad528044a (patch)
tree93b089d7b94f7c3b9f29d7fa2efc3c3ecf027e33 /build.xml
parentc99c9c31449b7366ffd51044bddd9859293cea9e (diff)
downloadtoolchain_jack-61eb97c58c3dcffbfb1498031e944a9ad528044a.zip
toolchain_jack-61eb97c58c3dcffbfb1498031e944a9ad528044a.tar.gz
toolchain_jack-61eb97c58c3dcffbfb1498031e944a9ad528044a.tar.bz2
No target should depend on core-stubs-mini
Because it is a prebuilt and should not be automatically rebuilt. Change-Id: I1b199def41ab68595612feffa2aac29b5a5dcd44
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/build.xml b/build.xml
index 6134d38..7ba1c25 100644
--- a/build.xml
+++ b/build.xml
@@ -1353,7 +1353,7 @@
<delete file="${junit4-jack.dist.dir}/${junit4-jack.libname}" />
</target>
- <target name="junit4-jack-lib" depends="hamcrest-core-jack-lib,core-stubs-mini">
+ <target name="junit4-jack-lib" depends="hamcrest-core-jack-lib">
<!-- project layout -->
<mkdir dir="${junit4-jack.build.outdir}"/>
<mkdir dir="${junit4-jack.dist.dir}"/>
@@ -1362,7 +1362,7 @@
<arg value="--verbose"/>
<arg value="error"/>
<arg value="--classpath"/>
- <arg value="${core-stubs-mini.dist.dir}/${core-stubs-mini.jack.libname}:${hamcrest-core-jack.dist.dir}/${hamcrest-core-jack.libname}"/>
+ <arg value="${jack.prebuilts.dir}/${core-stubs-mini.jack.libname}:${hamcrest-core-jack.dist.dir}/${hamcrest-core-jack.libname}"/>
<arg value="--output-jack"/>
<arg value="${junit4-jack.dist.dir}/${junit4-jack.libname}"/>
<arg value="${junit4.dir}/src/main/java"/>
@@ -1420,7 +1420,7 @@
<delete dir="${hamcrest-core-jack.dist.dir}" />
</target>
- <target name="hamcrest-core-jack-lib" depends="core-stubs-mini">
+ <target name="hamcrest-core-jack-lib">
<!-- project layout -->
<mkdir dir="${hamcrest-core-jack.build.outdir}"/>
<mkdir dir="${hamcrest-core-jack.dist.dir}"/>
@@ -1429,7 +1429,7 @@
<arg value="--verbose"/>
<arg value="error"/>
<arg value="--classpath"/>
- <arg value="${core-stubs-mini.dist.dir}/${core-stubs-mini.jack.libname}"/>
+ <arg value="${jack.prebuilts.dir}/${core-stubs-mini.jack.libname}"/>
<arg value="--output-jack"/>
<arg value="${hamcrest-core-jack.dist.dir}/${hamcrest-core-jack.libname}"/>
<arg value="${hamcrest-core.dir}/src"/>
@@ -1580,7 +1580,7 @@
</target>
- <target name="jack-default-lib" depends="jack-intermediate,core-stubs-mini,jack-default-lib.check" unless="jack-default-lib.uptodate">
+ <target name="jack-default-lib" depends="jack-intermediate,jack-default-lib.check" unless="jack-default-lib.uptodate">
<delete dir="${jack-default-lib.build.outdir}" quiet="true"/>
<mkdir dir="${jack-default-lib.build.outdir}"/>
<fileset id="jack-default-lib.src.fileset" dir="${jack.dir}/src" includes="com/android/jack/annotations/*.java"/>
@@ -1592,7 +1592,7 @@
<arg value="-D"/>
<arg value="jack.classpath.default-libraries=false"/>
<arg value="--classpath"/>
- <arg value="${core-stubs-mini.dist.dir}/${core-stubs-mini.jack.libname}"/>
+ <arg value="${jack.prebuilts.dir}/${core-stubs-mini.jack.libname}"/>
<arg value="--output-jack-dir"/>
<arg value="${jack-default-lib.build.outdir}"/>
<arg line="${jack-default-lib.src.list}"/>