diff options
author | michelou <michelou@epfl.ch> | 2008-02-25 11:15:41 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2008-02-25 11:15:41 +0000 |
commit | b4916be877bd007cb46c038f4f60fe3ca5bb8354 (patch) | |
tree | 23148475fa2d973a161db8a95a2e2850cdab2da3 | |
parent | e690f4cc382a1a44bb539671446c779bffb37147 (diff) | |
download | scala-b4916be877bd007cb46c038f4f60fe3ca5bb8354.tar.gz scala-b4916be877bd007cb46c038f4f60fe3ca5bb8354.tar.bz2 scala-b4916be877bd007cb46c038f4f60fe3ca5bb8354.zip |
fixed android build
-rw-r--r-- | build.xml | 1 | ||||
-rw-r--r-- | src/android-library/scala/ScalaObject.scala | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -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 { |