reverted (unwanted) change in build.xml
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@13349 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
parent
0b19d666e5
commit
dd9aacd2d6
29
build.xml
29
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
|
||||
============================================================================ -->
|
||||
|
|
Loading…
Reference in New Issue