diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2014-07-23 17:47:07 +0200 |
|---|---|---|
| committer | Jean-Marie Henaff <jmhenaff@google.com> | 2014-07-30 09:21:21 +0200 |
| commit | 0443d8a7f52895f6c7ca75dec4a5a21b99d4914b (patch) | |
| tree | 578060a8adf14f05ff30f022f1511a326c5d8743 | |
| parent | 510c93a03fc7ad16280e264c1b11fb85e0527b57 (diff) | |
| download | toolchain_jack-0443d8a7f52895f6c7ca75dec4a5a21b99d4914b.tar.gz toolchain_jack-0443d8a7f52895f6c7ca75dec4a5a21b99d4914b.tar.bz2 toolchain_jack-0443d8a7f52895f6c7ca75dec4a5a21b99d4914b.zip | |
Make forked tasks fail on error in Ant script
Otherwise ant can display that the build is successful whereas it's not.
(cherry picked from commit a1bc644ebb89558f3dfe748f171baf6704937419)
Change-Id: Ie33ea06f1beb4b36b2f64613308d33bb3e4adb93
| -rw-r--r-- | build.xml | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -140,7 +140,7 @@ </filelist> </copy> <!-- generate parser --> - <java jar="${jack.tools.dir}/${antlr.execname}" fork="true"> + <java jar="${jack.tools.dir}/${antlr.execname}" fork="true" failonerror="true"> <arg line="-fo" /> <arg line="${jack.dir}/src/com/android/jack/shrob/proguard"/> <arg line="${jack.dir}/src/com/android/jack/shrob/proguard/Proguard.g"/> @@ -193,7 +193,7 @@ manifest="${jack.dir}/etc/manifest.txt" basedir="${jack.exec.build.outdir}" includes="**"/> <pathconvert property="jack.static.libs.list" pathsep=" " refid="jack.static.libs.fileset" /> <!-- add sched support --> - <java jar="${jack.tools.dir}/${sched-build.execname}" fork="true"> + <java jar="${jack.tools.dir}/${sched-build.execname}" fork="true" failonerror="true"> <arg value="${jack.exec.build.dir}/${jack.execname}" /> <arg line="${jack.static.libs.list}" /> <arg value="${jack.dist.dir}/${jack.execname}" /> @@ -249,7 +249,7 @@ basedir="${jackunittests.build.outdir}" includes="**" /> <pathconvert property="jackunittests.static.libs.list" pathsep=" " refid="jackunittests.static.libs.fileset" /> <!-- add sched support --> - <java jar="${jackunittests.tools.dir}/${sched-build.execname}" fork="true"> + <java jar="${jackunittests.tools.dir}/${sched-build.execname}" fork="true" failonerror="true"> <arg value="${jackunittests.build.dir}/${jackunittests.libname}" /> <arg line="${jackunittests.static.libs.list}" /> <arg line="${jack.static.libs.list}" /> @@ -1001,7 +1001,7 @@ <fileset dir="${core-stubs-mini.dir}/src"> <include name="**/*.java"/> </fileset> - <java fork="true" jar="${jack.dist.dir}/${jack.execname}"> + <java jar="${jack.dist.dir}/${jack.execname}" fork="true" failonerror="true"> <arg value="--jack-output"/> <arg value="${core-stubs-mini.build.dir}"/> <arg value="--ecj"/> |