natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed android build 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@14122 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
michelou 2008-02-25 11:15:41 +00:00
parent 594bcbfbdc
commit 9948d7b287
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.xml
View File

@ -980,6 +980,7 @@ ANDROID
<arg value="--output=${android.dir}/lib/scala.dex"/>
<arg value="--locals=full"/>
<arg value="--positions=lines"/>
<arg value="--no-optimize"/> <!-- workaround for M5-RC14 bug -->
<arg value="${android.dir}/lib/library"/>
</java>
<jar

3
src/android-library/scala/ScalaObject.scala
View File

@ -1,6 +1,6 @@
/* __ *\
** ________ ___ / / ___ Scala API **
** / __/ __// _ | / / / _ | (c) 2002-2007, LAMP/EPFL **
** / __/ __// _ | / / / _ | (c) 2002-2008, LAMP/EPFL **
** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
@ -11,6 +11,7 @@
package scala
import Predef._
trait ScalaObject extends AnyRef {