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

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

Merge "Revert "Add core-simple to the standard boot classpath"" am: 5a895375 am: 20516889 

am: 5fabfab4

Change-Id: Ie10ea0340e9b0cd4d0b497fa786b74d61c26c501
parents bff434ac 5fabfab4

core/envsetup.mk

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

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

# java code with dalvikvm/art.

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

TARGET_CORE_JARS := core-oj core-libart 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

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 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 \