From 9948d7b2876a21c9002aed3c87a495022b329e8d Mon Sep 17 00:00:00 2001
From: michelou <michelou@5e8d7ff9-d8ef-0310-90f0-a4852d11357a>
Date: Mon, 25 Feb 2008 11:15:41 +0000
Subject: [PATCH] fixed android build

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@14122 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
---
 build.xml                                   | 1 +
 src/android-library/scala/ScalaObject.scala | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index f706fbaa4..1400e82e9 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 17777b856..146c7f515 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 {