From c69129b2b801b1386fadfd3b44b09f28775d5b04 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Fri, 9 Nov 2018 15:57:35 +0000 Subject: [PATCH] Revert "Add core-simple to the standard boot classpath" This reverts commit e85777782a56ff8feb7f2c06a552a3e017511b55. Bug: 119301609 Test: build Change-Id: Ibf9f9f56a6027a4cc3f3ea5a34b3dee748ad83c2 --- core/envsetup.mk | 2 +- core/pdk_config.mk | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/core/envsetup.mk b/core/envsetup.mk index f5babb64a1..8150fb6e67 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -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 diff --git a/core/pdk_config.mk b/core/pdk_config.mk index b2c9e9e492..383c11ad05 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk @@ -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 \