diff options
author | Neil Fuller | 2019-01-15 13:04:26 -0600 |
---|---|---|
committer | Gerrit Code Review | 2019-01-15 13:04:26 -0600 |
commit | 5a8953757430cacbf0a7b194f3861fb24e175636 (patch) | |
tree | 83fe1090a5a4069ca3b5916fecf3a530611de628 /core | |
parent | 63d012f987eeefb3b50b1780726fb9c20c7cd48c (diff) | |
parent | c69129b2b801b1386fadfd3b44b09f28775d5b04 (diff) | |
download | platform-build-5a8953757430cacbf0a7b194f3861fb24e175636.tar.gz platform-build-5a8953757430cacbf0a7b194f3861fb24e175636.tar.xz platform-build-5a8953757430cacbf0a7b194f3861fb24e175636.zip |
Merge "Revert "Add core-simple to the standard boot classpath""
Diffstat (limited to 'core')
-rw-r--r-- | core/envsetup.mk | 2 | ||||
-rw-r--r-- | core/pdk_config.mk | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index f5babb64a..8150fb6e6 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk | |||
@@ -206,7 +206,7 @@ endef | |||
206 | ################################################################# | 206 | ################################################################# |
207 | # Set up minimal BOOTCLASSPATH list of jars to build/execute | 207 | # Set up minimal BOOTCLASSPATH list of jars to build/execute |
208 | # java code with dalvikvm/art. | 208 | # java code with dalvikvm/art. |
209 | TARGET_CORE_JARS := core-oj core-libart core-simple conscrypt okhttp bouncycastle apache-xml | 209 | TARGET_CORE_JARS := core-oj core-libart conscrypt okhttp bouncycastle apache-xml |
210 | ifeq ($(EMMA_INSTRUMENT),true) | 210 | ifeq ($(EMMA_INSTRUMENT),true) |
211 | ifneq ($(EMMA_INSTRUMENT_STATIC),true) | 211 | ifneq ($(EMMA_INSTRUMENT_STATIC),true) |
212 | # For instrumented build, if Jacoco is not being included statically | 212 | # For instrumented build, if Jacoco is not being included statically |
diff --git a/core/pdk_config.mk b/core/pdk_config.mk index b2c9e9e49..383c11ad0 100644 --- a/core/pdk_config.mk +++ b/core/pdk_config.mk | |||
@@ -20,7 +20,6 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR += \ | |||
20 | target/common/obj/JAVA_LIBRARIES/conscrypt_intermediates \ | 20 | target/common/obj/JAVA_LIBRARIES/conscrypt_intermediates \ |
21 | target/common/obj/JAVA_LIBRARIES/core-oj_intermediates \ | 21 | target/common/obj/JAVA_LIBRARIES/core-oj_intermediates \ |
22 | target/common/obj/JAVA_LIBRARIES/core-libart_intermediates \ | 22 | target/common/obj/JAVA_LIBRARIES/core-libart_intermediates \ |
23 | target/common/obj/JAVA_LIBRARIES/core-simple_intermediates \ | ||
24 | target/common/obj/JAVA_LIBRARIES/legacy-test_intermediates \ | 23 | target/common/obj/JAVA_LIBRARIES/legacy-test_intermediates \ |
25 | target/common/obj/JAVA_LIBRARIES/legacy-android-test_intermediates \ | 24 | target/common/obj/JAVA_LIBRARIES/legacy-android-test_intermediates \ |
26 | target/common/obj/JAVA_LIBRARIES/ext_intermediates \ | 25 | target/common/obj/JAVA_LIBRARIES/ext_intermediates \ |