summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-04-07 13:30:36 +0000
committerGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-04-07 13:30:36 +0000
commit64dc793f3e5044971933a43bfcfecc536faf372f (patch)
tree4d87e9fea52a52ff93a007249a136e49bb7d12da /build.xml
parente657891d8e17070fd29c40f35c06c6c9c9fe8d61 (diff)
downloadscala-64dc793f3e5044971933a43bfcfecc536faf372f.tar.gz
scala-64dc793f3e5044971933a43bfcfecc536faf372f.tar.bz2
scala-64dc793f3e5044971933a43bfcfecc536faf372f.zip
Fixed android build.
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml17
1 files changed, 3 insertions, 14 deletions
diff --git a/build.xml b/build.xml
index 9fe6724e66..2c99a76a2f 100644
--- a/build.xml
+++ b/build.xml
@@ -899,22 +899,11 @@ ANDROID
description="Create the source directory for Android library"
>
<mkdir dir="${android.dir}/src"/>
-
<copy todir="${android.dir}/src">
- <fileset dir="${src.dir}/library"
- includes="**/*.scala, **/*.java"
- excludes="scala/reflect/ScalaBeanInfo.scala">
- <not>
- <present targetdir="${src.dir}/android-library"/>
- </not>
- </fileset>
- </copy>
-
+ <fileset dir="${src.dir}/android-library" includes="**/*.scala, **/*.java"/>
+ </copy>
<copy todir="${android.dir}/src">
- <fileset dir="${src.dir}/android-library">
- <include name="**/*.scala"/>
- <include name="**/*.java"/>
- </fileset>
+ <fileset dir="${src.dir}/library" includes="**/*.scala, **/*.java" />
</copy>
</target>