summaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorJean-Marie Henaff <jmhenaff@google.com>2014-10-23 15:29:06 +0200
committerJean-Marie Henaff <jmhenaff@google.com>2014-10-24 10:02:53 +0200
commit8b9ff554031a1ef9f9cefb7622e4204087ed3c45 (patch)
treec64180fe4eb377c4a2db410906ad32f8cdb107c4 /build.xml
parentf55223a6f9ffb7152dbe5c01277151a1ed4b9a88 (diff)
downloadtoolchain_jack-8b9ff554031a1ef9f9cefb7622e4204087ed3c45.tar.gz
toolchain_jack-8b9ff554031a1ef9f9cefb7622e4204087ed3c45.tar.bz2
toolchain_jack-8b9ff554031a1ef9f9cefb7622e4204087ed3c45.zip
Update Jack command line
Change-Id: I9e885da1906f44db9b0e3b4408161654af42fad7
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml15
1 files changed, 8 insertions, 7 deletions
diff --git a/build.xml b/build.xml
index 0e33f75c..d6a3fb33 100644
--- a/build.xml
+++ b/build.xml
@@ -1089,7 +1089,8 @@
<!-- ******************* -->
<property name="core-stubs-mini.dist.dir" value="${core-stubs-mini.dir}/dist"/>
<property name="core-stubs-mini.build.dir" value="${core-stubs-mini.dir}/build"/>
- <property name="core-stubs-mini.libname" value="core-stubs-mini.jar"/>
+ <property name="core-stubs-mini.build.outdir" value="${core-stubs-mini.build.dir}/classes"/>
+ <property name="core-stubs-mini.libname" value="core-stubs-mini.jar"/>
<target name="core-stubs-mini-clean">
<delete dir="${core-stubs-mini.build.dir}" />
@@ -1102,17 +1103,17 @@
<include name="**/*.java"/>
</fileset>
<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"/>
- <arg value="-nowarn"/>
+ <arg value="--output-jack"/>
+ <arg value="${core-stubs-mini.build.dir}/${core-stubs-mini.libname}"/>
<arg value="${core-stubs-mini.dir}/src"/>
</java>
+ <unzip src = "${core-stubs-mini.build.dir}/${core-stubs-mini.libname}"
+ dest = "${core-stubs-mini.build.outdir}" />
<javac srcdir="${core-stubs-mini.dir}/src"
- destdir="${core-stubs-mini.build.dir}"
+ destdir="${core-stubs-mini.build.outdir}"
source="1.5" target="1.5" debug="true" includeantruntime="false" includeDestClasses="false"/>
<jar destfile="${core-stubs-mini.dist.dir}/${core-stubs-mini.libname}"
- basedir="${core-stubs-mini.build.dir}"
+ basedir="${core-stubs-mini.build.outdir}"
includes="**"/>
<copy todir="${jack.libs.dir}" flatten="true">
<filelist dir="/">