Fix typo from previous change to fix the build

Change-Id: I6cf7217eb81abd794339143b7c23456b68808caf
This commit is contained in:
Mike Lockwood 2013-08-06 16:07:13 -07:00
parent 6e5d867e30
commit c73018c2e9
2 changed files with 5 additions and 3 deletions

View File

@ -408,6 +408,11 @@ HOST_GLOBAL_CPPFLAGS += $(HOST_RELEASE_CPPFLAGS)
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

View File

@ -43,9 +43,6 @@ ifneq ($(LOCAL_SDK_VERSION),)
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