From da6d015bf5b150d62643f8ab5b02a84a989ad7ba Mon Sep 17 00:00:00 2001
From: washburn <washburn@5e8d7ff9-d8ef-0310-90f0-a4852d11357a>
Date: Mon, 7 Apr 2008 13:30:36 +0000
Subject: [PATCH] Fixed android build.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@14535 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
---
 build.xml                                       | 17 +++--------------
 .../scala/reflect/ScalaBeanInfo.scala           |  1 +
 2 files changed, 4 insertions(+), 14 deletions(-)
 create mode 100644 src/android-library/scala/reflect/ScalaBeanInfo.scala

diff --git a/build.xml b/build.xml
index 9fe6724e6..2c99a76a2 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 000000000..05c7bced7
--- /dev/null
+++ b/src/android-library/scala/reflect/ScalaBeanInfo.scala
@@ -0,0 +1 @@
+/* ScalaBeanInfo does not exist for the Android target */