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

Commit e8577778 authored by Neil Fuller's avatar Neil Fuller
Browse files

Add core-simple to the standard boot classpath 

core-simple.jar is being added to the runtime classpath as
an easy-to-find placeholder and to help identify places that
care about the boot classpath / trigger conversations & issues /
force discussion.

See http://go/simple-module

To start, this jar is being added in various locations that know
about core-libart and/or core-oj.  There will be follow-up changes to
make core-simple.jar more than just another core-* jar.

Bug: 113148576
Test: Treehugger
Test: make checkbuild
Change-Id: I267a91b8728f84cfb1b2e8a5c5d157c88b75581c
parent 9fb70170

core/apidiff.mk

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

  endif

else

  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)

  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):$(call java-lib-files, core-simple)

endif  # LOCAL_SDK_VERSION

LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))

core/envsetup.mk

+1 −1
Original line number 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

# 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)

  ifneq ($(EMMA_INSTRUMENT_STATIC),true)

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

core/pdk_config.mk

+1 −0
Original line number 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/core-oj_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-android-test_intermediates \

  target/common/obj/JAVA_LIBRARIES/ext_intermediates \