summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.xml17
-rw-r--r--src/android-library/scala/reflect/ScalaBeanInfo.scala1
2 files changed, 4 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>
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 */