summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2008-02-20 09:19:02 +0000
committermichelou <michelou@epfl.ch>2008-02-20 09:19:02 +0000
commit151cbc5c27d2dd2010630cb0ea1589ca807af594 (patch)
tree4ec1ff33cffd1f75d5e2b5e1189b1935852bfa12 /build.xml
parent3a6ce7d18a54da03574a8fb1f5cbd8e986d84492 (diff)
downloadscala-151cbc5c27d2dd2010630cb0ea1589ca807af594.tar.gz
scala-151cbc5c27d2dd2010630cb0ea1589ca807af594.tar.bz2
scala-151cbc5c27d2dd2010630cb0ea1589ca807af594.zip
fixed dependency in build.xml
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml5
1 files changed, 2 insertions, 3 deletions
diff --git a/build.xml b/build.xml
index b3b88ea81d..4dc66cdced 100644
--- a/build.xml
+++ b/build.xml
@@ -972,6 +972,7 @@ ANDROID
<target name="android.build" depends="android.libraries"
description="Convert this project's .class files into .dex files">
+ <property name="dx.jar" value="${android.home}/tools/lib/dx.jar"/>
<java jar="${dx.jar}" fork="true" failonerror="true">
<jvmarg value="-Djava.ext.dirs=${android.home}${file.separator}tools${file.separator}lib"/>
<jvmarg value="-Xmx384M"/>
@@ -1001,9 +1002,7 @@ ANDROID
</and>
</condition>
<if><isset property="android.supported"/><then>
- <antcall target="android.build">
- <param name="dx.jar" value="${android.home}/tools/lib/dx.jar"/>
- </antcall>
+ <antcall target="android.build"/>
</then><else>
<echo message="The Android library build requires Sun Java 1.5 or newer"/>
</else></if>