commit 6e5d867e30a476141c8fb1cd4f409c9d5e456ae7
author Mike Lockwood <lockwood@google.com> Tue Aug 06 15:07:18 2013 -0700
committer Mike Lockwood <lockwood@google.com> Tue Aug 06 15:07:18 2013 -0700
tree 7270b0a94766dba6dc3bff56ef425a0b6f837039
parent ee0748821f9d091dad21ad6baa08f3f3a2878b73

Add support for overriding default Java libraries on a per-target basis

Change-Id: I425041554867a7ed7d74e1d603f160b2110bc86b

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index c7e93b7..2d9f1fb 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -43,7 +43,10 @@
   endif
 else
   ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
-    LOCAL_JAVA_LIBRARIES := core core-junit ext framework framework2 $(LOCAL_JAVA_LIBRARIES)
+    ifeq (TARGET_DEFAULT_JAVA_LIBRARIES,)
+      TARGET_DEFAULT_JAVA_LIBRARIES := core core-junit ext framework framework2
+    endif
+    LOCAL_JAVA_LIBRARIES := $(TARGET_DEFAULT_JAVA_LIBRARIES) $(LOCAL_JAVA_LIBRARIES)
   endif
 endif