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

Commit 052a00f6 authored by Piotr Jastrzebski's avatar Piotr Jastrzebski Committed by Narayan Kamath
Browse files

Use core-oj alongside core-libart wherever required. 

With some core classes moved to separate core-oj jar
we need to use the new jar.

(cherry picked from commit 89b94c82)

Change-Id: I025c0adc70535bf23def3ab0ce28a1bfaef72514
parent f9911ae0

core/config.mk

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


# allow overriding default Java libraries on a per-target basis

ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)

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

  TARGET_DEFAULT_JAVA_LIBRARIES := core-oj core-libart core-junit ext framework okhttp

endif



# Flags for DEX2OAT

core/droiddoc.mk

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

  endif

else

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

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

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

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

endif  # LOCAL_SDK_VERSION

LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))

core/host_dalvik_java_library.mk

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



ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

  LOCAL_JAVA_LIBRARIES +=  core-oj-hostdex

  LOCAL_JAVA_LIBRARIES +=  core-libart-hostdex

endif

core/host_dalvik_static_java_library.mk

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ ifeq ($(HOST_OS),linux) 
LOCAL_UNINSTALLABLE_MODULE := true

LOCAL_IS_STATIC_JAVA_LIBRARY := true

USE_CORE_LIB_BOOTCLASSPATH := true

LOCAL_JAVA_LIBRARIES += core-oj-hostdex

LOCAL_JAVA_LIBRARIES += core-libart-hostdex



intermediates.COMMON := $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),true,COMMON,)

core/java_common.mk

+4 −4
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true) 
# No bootclasspath. But we still need "" to prevent javac from using default host bootclasspath.

my_bootclasspath := ""

else  # LOCAL_NO_STANDARD_LIBRARIES

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

my_bootclasspath := $(call java-lib-files,core-oj):$(call java-lib-files,core-libart)

endif  # LOCAL_NO_STANDARD_LIBRARIES

else

ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)
@@ -161,7 +161,7 @@ ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true) 
ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

my_bootclasspath := ""

else

my_bootclasspath := $(call java-lib-files,core-libart-hostdex,$(LOCAL_IS_HOST_MODULE))

my_bootclasspath := $(call java-lib-files,core-oj-hostdex,$(LOCAL_IS_HOST_MODULE)):$(call java-lib-files,core-libart-hostdex,$(LOCAL_IS_HOST_MODULE))

endif

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(my_bootclasspath)
@@ -277,7 +277,7 @@ ifeq ($(LOCAL_SDK_VERSION),) 
ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

my_bootclasspath :=

else

my_bootclasspath := $(call jack-lib-files,core-libart)

my_bootclasspath :=  $(call jack-lib-files,core-oj):$(call jack-lib-files,core-libart)

endif

else  # LOCAL_SDK_VERSION

ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)
@@ -304,7 +304,7 @@ ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true) 
ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

my_bootclasspath :=

else

my_bootclasspath := $(call jack-lib-files,core-libart-hostdex,$(LOCAL_IS_HOST_MODULE))

my_bootclasspath := $(call jack-lib-files,core-oj-hostdex,$(LOCAL_IS_HOST_MODULE)):$(call jack-lib-files,core-libart-hostdex,$(LOCAL_IS_HOST_MODULE))

endif

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES := $(my_bootclasspath)

full_shared_jack_libs := $(call jack-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))