Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dab766a7 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Gerrit Code Review
Browse files

Merge "Switch from core to core-libart"

parents 0f1ca830 b1dafb18

core/base_rules.mk

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_ja 
#                 be up-to-date.

ifdef LOCAL_IS_HOST_MODULE

ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-deps,core-hostdex,$(LOCAL_IS_HOST_MODULE))

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-deps,core-libart-hostdex,$(LOCAL_IS_HOST_MODULE))



full_shared_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))

full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ endif 


# 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

  TARGET_DEFAULT_JAVA_LIBRARIES := core-libart core-junit ext framework framework2

endif



TARGET_CPU_SMP ?= true

core/droiddoc.mk

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ ifneq ($(LOCAL_SDK_VERSION),) 
    $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(LOCAL_SDK_VERSION))

  endif

else

  LOCAL_JAVA_LIBRARIES := core ext framework framework2 $(LOCAL_JAVA_LIBRARIES)

  $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core)

  LOCAL_JAVA_LIBRARIES := core-libart ext framework framework2 $(LOCAL_JAVA_LIBRARIES)

  $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core-libart)

endif  # LOCAL_SDK_VERSION

LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))

core/host_dalvik_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ include $(BUILD_SYSTEM)/host_java_library_common.mk 
#######################################



ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

  LOCAL_JAVA_LIBRARIES +=  core-hostdex

  LOCAL_JAVA_LIBRARIES +=  core-libart-hostdex

endif



full_classes_compiled_jar := $(intermediates.COMMON)/classes-full-debug.jar

core/host_dalvik_static_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#



USE_CORE_LIB_BOOTCLASSPATH := true

LOCAL_JAVA_LIBRARIES += core-hostdex

LOCAL_JAVA_LIBRARIES += core-libart-hostdex



include $(BUILD_SYSTEM)/host_java_library.mk