Loading core/config.mk +5 −0 Original line number Diff line number Diff line Loading @@ -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 Loading core/java.mk +0 −3 Original line number Diff line number Diff line Loading @@ -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 Loading Loading
core/config.mk +5 −0 Original line number Diff line number Diff line Loading @@ -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 Loading
core/java.mk +0 −3 Original line number Diff line number Diff line Loading @@ -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 Loading