Fix typo from previous change to fix the build
Change-Id: I6cf7217eb81abd794339143b7c23456b68808caf
diff --git a/core/config.mk b/core/config.mk
index 460e5c3..8be539c 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -408,6 +408,11 @@
TARGET_GLOBAL_CFLAGS += $(TARGET_RELEASE_CFLAGS)
TARGET_GLOBAL_CPPFLAGS += $(TARGET_RELEASE_CPPFLAGS)
+# allow overriding default Java libraries on a per-target basis
+ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)
+ TARGET_DEFAULT_JAVA_LIBRARIES := core core-junit ext framework framework2
+endif
+
# define llvm tools and global flags
include $(BUILD_SYSTEM)/llvm_config.mk
diff --git a/core/java.mk b/core/java.mk
index 2d9f1fb..8abfb39 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -43,9 +43,6 @@
endif
else
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
- 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