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

Change-Id: I425041554867a7ed7d74e1d603f160b2110bc86b
2013-08-06 15:07:18 -07:00
parent ee0748821f
commit 6e5d867e30
1 changed files with 4 additions and 1 deletions
--- a/core/java.mk
+++ b/core/java.mk
@@ -43,7 +43,10 @@ ifneq ($(LOCAL_SDK_VERSION),)
  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