summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.xml1
-rw-r--r--src/android-library/scala/ScalaObject.scala3
2 files changed, 3 insertions, 1 deletions
diff --git a/build.xml b/build.xml
index f706fbaa42..1400e82e97 100644
--- a/build.xml
+++ b/build.xml
@@ -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
diff --git a/src/android-library/scala/ScalaObject.scala b/src/android-library/scala/ScalaObject.scala
index 17777b8561..146c7f515c 100644
--- a/src/android-library/scala/ScalaObject.scala
+++ b/src/android-library/scala/ScalaObject.scala
@@ -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 {