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

Commit 89b94c82 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.

Change-Id: Ie069c7a93e63b1df854b3137d984b96520562609
parent 06aabe53

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,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
@@ -133,7 +133,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RMTYPEDEFS := $(LOCAL_RMTYPEDEFS) 
#                 be up-to-date.

ifndef LOCAL_IS_HOST_MODULE

ifeq ($(LOCAL_SDK_VERSION),)

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

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

else

ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)

# LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS.
@@ -151,7 +151,7 @@ full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HO 
else # LOCAL_IS_HOST_MODULE



ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true)

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

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,core-oj-hostdex,$(LOCAL_IS_HOST_MODULE)):$(call java-lib-files,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)) \
@@ -262,7 +262,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JACK_LIBRARIES := $(full_static_ja 


ifndef LOCAL_IS_HOST_MODULE

ifeq ($(LOCAL_SDK_VERSION),)

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

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

else

ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)

# LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS.
@@ -280,7 +280,7 @@ full_jack_lib_deps := $(call jack-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HO 
else # LOCAL_IS_HOST_MODULE



ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true)

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

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

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

full_jack_lib_deps := $(call jack-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))

else