commit 72c941a14757255a73f0bf31d689cc2b99fff6cf
author Jesse Wilson <jessewilson@google.com> Tue May 04 16:33:49 2010 -0700
committer Jesse Wilson <jessewilson@google.com> Tue May 04 16:33:49 2010 -0700
tree cb321de6845cf46f9952002013d66af1a2f72802
parent eaf130ec2c4fc643f63614bae8a94bc1fed12068

Moving junit out of core.jar and into core-junit.jar.

Also extending the arbitrary limit on build argument sizes,
which I ran up against in building after this change.

Change-Id: Iba79a37b27e7d5efa2b02a99aa253a2eec7ede75

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 72888ed..f876f7f 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1272,7 +1272,12 @@
         @$(call emit-line,$(wordlist 3401,3600,$(1)),$(2))
         @$(call emit-line,$(wordlist 3601,3800,$(1)),$(2))
         @$(call emit-line,$(wordlist 3801,4000,$(1)),$(2))
-        @$(if $(wordlist 4001,4002,$(1)),$(error Too many words ($(words $(1)))))
+        @$(call emit-line,$(wordlist 4001,4200,$(1)),$(2))
+        @$(call emit-line,$(wordlist 4201,4400,$(1)),$(2))
+        @$(call emit-line,$(wordlist 4401,4600,$(1)),$(2))
+        @$(call emit-line,$(wordlist 4601,4800,$(1)),$(2))
+        @$(call emit-line,$(wordlist 4801,5000,$(1)),$(2))
+        @$(if $(wordlist 5001,5002,$(1)),$(error Too many words ($(words $(1)))))
 endef
 
 # For a list of jar files, unzip them to a specified directory,

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 11b615f..62ae7a4 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))