commit 7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0
author Brian Carlstrom <bdc@google.com> Wed Aug 04 23:17:47 2010 -0700
committer Brian Carlstrom <bdc@google.com> Wed Aug 04 23:17:47 2010 -0700
tree cad1e461cc21b7238204dd3f6bee588150ed14e5
parent e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4

Tracking merge of dalvik-dev to gingerbread

git cherry-pick --no-commit f2f3e4b2
git cherry-pick --no-commit b6a08f0cd36b12054ac73992a2737ea294387116
git cherry-pick --no-commit d05d74b2d6f717ee25ca14c913ea7610c030ecd1
git cherry-pick --no-commit 5479d77e320420ef0cd7250d1a6729839ef907ce

Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 9f7715b..4c34479 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -29,7 +29,7 @@
   endif
 else
   ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
-    LOCAL_JAVA_LIBRARIES := core ext framework $(LOCAL_JAVA_LIBRARIES)
+    LOCAL_JAVA_LIBRARIES := core core-junit ext framework $(LOCAL_JAVA_LIBRARIES)
   endif
 endif
 LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))