summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2007-11-26 12:27:00 +0000
committermichelou <michelou@epfl.ch>2007-11-26 12:27:00 +0000
commit83ac2b566929edb17629d20bf4dcba3b8d2bd14e (patch)
treef3c9ed3b1bba6b55390866cdc7c429eca9af62a0 /build.xml
parent639adcce01aeef1d8161b2e6f3bf0fad16928f15 (diff)
downloadscala-83ac2b566929edb17629d20bf4dcba3b8d2bd14e.tar.gz
scala-83ac2b566929edb17629d20bf4dcba3b8d2bd14e.tar.bz2
scala-83ac2b566929edb17629d20bf4dcba3b8d2bd14e.zip
reverted (unwanted) change in build.xml
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml29
1 files changed, 0 insertions, 29 deletions
diff --git a/build.xml b/build.xml
index 01c42e6919..aeec0900cd 100644
--- a/build.xml
+++ b/build.xml
@@ -849,13 +849,6 @@ ANDROID
<include name="**/*.java"/>
</javac>
- <javac
- srcdir="${android.dir}/src"
- destdir="${android.dir}"
- source="1.4" target="1.4" deprecation="yes"
- classpath="${android.dir}"
- includes="**/*.java"
- />
<quick
srcdir="${android.dir}/src"
destdir="${android.dir}/lib/library"
@@ -889,28 +882,6 @@ ANDROID
</quick>
</target>
- <target name="dex" depends="android.lib"
- description="Convert this project's .class files into .dex files">
- <exec executable="${android.home}/tools/dx" failonerror="false">
- <arg value="-JXmx384M"/>
- <arg value="--dex"/>
- <arg value="--output=${android.dir}/classes.dex"/>
- <arg value="--locals=full"/>
- <arg value="--positions=lines"/>
- <arg path="${android.dir}"/>
- </exec>
- <jar
- destfile="${android.dir}/scala.jar"
- basedir="${android.dir}"
- includes="classes.dex"
- />
- <jar
- destfile="${android.dir}/scala-library.jar"
- basedir="${android.dir}"
- includes="scala/**/*.class"
- />
- </target>
-
<!-- ===========================================================================
MSIL
============================================================================ -->