diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2007-11-23 13:21:53 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2007-11-23 13:21:53 +0000 |
| commit | b6f9e1752cc4d48b85f50b017839ca71e4fffa91 (patch) | |
| tree | baf240a2e2cfdbe41dc1d708b83b6e749be5297f /build.xml | |
| parent | aab21c2dc81e5ba7bce33f87ff96fd5b398f1bf9 (diff) | |
| download | scala-b6f9e1752cc4d48b85f50b017839ca71e4fffa91.tar.gz scala-b6f9e1752cc4d48b85f50b017839ca71e4fffa91.tar.bz2 scala-b6f9e1752cc4d48b85f50b017839ca71e4fffa91.zip | |
Fixed compilation for java files in target andr...
Fixed compilation for java files in target android.lib
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 22 |
1 files changed, 16 insertions, 6 deletions
@@ -834,12 +834,24 @@ ANDROID </not></condition> </fail> - <mkdir dir="${android.dir}"/> - <echo message="android.home=${android.home}"/> + <mkdir dir="${android.dir}/lib/library"/> + <javac + srcdir="${android.dir}/src" + destdir="${android.dir}/lib/library" + compiler="javac1.4" + source="1.1" + target="1.1" + deprecation="${jc.deprecation}" + > + <bootclasspath> + <pathelement location="${android.home}/android.jar}"/> + </bootclasspath> + <include name="**/*.java"/> + </javac> <quick srcdir="${android.dir}/src" - destdir="${android.dir}" + destdir="${android.dir}/lib/library" usepredefs="no" addparams="${nsc.params}" extdirs="" @@ -847,21 +859,19 @@ ANDROID > <bootclasspath> <pathelement location="${android.home}/android.jar"/> - <pathelement location="${quick.dir}/lib/library"/> </bootclasspath> <include name="scala/Predef.scala"/> </quick> <quick srcdir="${android.dir}/src" - destdir="${android.dir}" + destdir="${android.dir}/lib/library" extdirs="" addparams="${nsc.params}" scalacdebugging="${nsc.log-files}" > <bootclasspath> <pathelement location="${android.home}/android.jar"/> - <pathelement location="${quick.dir}/lib/library"/> </bootclasspath> <classpath> <pathelement location="${android.dir}"/> |