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

Commit 6bdeee9e authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Add core-simple to the standard boot classpath" am: ba125933 

am: 77e0f617

Change-Id: Ifa218c7066f788af2b0b23147efaf88a3a189220
parents f4018734 77e0f617

core/apidiff.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -64,8 +64,8 @@ ifneq ($(LOCAL_SDK_VERSION),) 
    _module_name :=

    _module_name :=

  endif

  endif

else

else

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

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

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

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

endif  # LOCAL_SDK_VERSION

endif  # LOCAL_SDK_VERSION

LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))

LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))

core/envsetup.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -236,7 +236,7 @@ TARGET_COPY_OUT_ODM := $(_odm_path_placeholder) 
#################################################################

#################################################################

# Set up minimal BOOTCLASSPATH list of jars to build/execute

# Set up minimal BOOTCLASSPATH list of jars to build/execute

# java code with dalvikvm/art.

# java code with dalvikvm/art.

TARGET_CORE_JARS := core-oj core-libart conscrypt okhttp bouncycastle apache-xml

TARGET_CORE_JARS := core-oj core-libart core-simple conscrypt okhttp bouncycastle apache-xml

ifeq ($(EMMA_INSTRUMENT),true)

ifeq ($(EMMA_INSTRUMENT),true)

  ifneq ($(EMMA_INSTRUMENT_STATIC),true)

  ifneq ($(EMMA_INSTRUMENT_STATIC),true)

    # For instrumented build, if Jacoco is not being included statically

    # For instrumented build, if Jacoco is not being included statically

core/pdk_config.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \ 
  target/common/obj/JAVA_LIBRARIES/conscrypt_intermediates \

  target/common/obj/JAVA_LIBRARIES/conscrypt_intermediates \

  target/common/obj/JAVA_LIBRARIES/core-oj_intermediates \

  target/common/obj/JAVA_LIBRARIES/core-oj_intermediates \

  target/common/obj/JAVA_LIBRARIES/core-libart_intermediates \

  target/common/obj/JAVA_LIBRARIES/core-libart_intermediates \

  target/common/obj/JAVA_LIBRARIES/core-simple_intermediates \

  target/common/obj/JAVA_LIBRARIES/legacy-test_intermediates \

  target/common/obj/JAVA_LIBRARIES/legacy-test_intermediates \

  target/common/obj/JAVA_LIBRARIES/legacy-android-test_intermediates \

  target/common/obj/JAVA_LIBRARIES/legacy-android-test_intermediates \

  target/common/obj/JAVA_LIBRARIES/ext_intermediates \

  target/common/obj/JAVA_LIBRARIES/ext_intermediates \