diff options
author | Geoffrey Washburn <geoffrey.washburn@epfl.ch> | 2008-04-07 13:30:36 +0000 |
---|---|---|
committer | Geoffrey Washburn <geoffrey.washburn@epfl.ch> | 2008-04-07 13:30:36 +0000 |
commit | 64dc793f3e5044971933a43bfcfecc536faf372f (patch) | |
tree | 4d87e9fea52a52ff93a007249a136e49bb7d12da | |
parent | e657891d8e17070fd29c40f35c06c6c9c9fe8d61 (diff) | |
download | scala-64dc793f3e5044971933a43bfcfecc536faf372f.tar.gz scala-64dc793f3e5044971933a43bfcfecc536faf372f.tar.bz2 scala-64dc793f3e5044971933a43bfcfecc536faf372f.zip |
Fixed android build.
-rw-r--r-- | build.xml | 17 | ||||
-rw-r--r-- | src/android-library/scala/reflect/ScalaBeanInfo.scala | 1 |
2 files changed, 4 insertions, 14 deletions
@@ -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> diff --git a/src/android-library/scala/reflect/ScalaBeanInfo.scala b/src/android-library/scala/reflect/ScalaBeanInfo.scala new file mode 100644 index 0000000000..05c7bced71 --- /dev/null +++ b/src/android-library/scala/reflect/ScalaBeanInfo.scala @@ -0,0 +1 @@ +/* ScalaBeanInfo does not exist for the Android target */ |