Fixed android build.
git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@14535 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
parent
5f3cefccd2
commit
da6d015bf5
17
build.xml
17
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>
|
||||
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
/* ScalaBeanInfo does not exist for the Android target */
|
Loading…
Reference in New Issue