commit cc33b6005f33bb7b8638117da23f14e027d42f05
author Mariano Giardina <giardina@google.com> Thu Jun 15 11:09:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 15 11:09:24 2017 +0000
tree 8052dbac8a657331b5109c8ebd90587733871229
parent 5022a346c7899bf035639ccd3dcfa86425a91648
parent 1e14bc3b7b8b21b1914cf9f5f79ad9846ceebcb1

Merge "Revert "core: Move core.oat bootjar definitions into core/config""
am: 1e14bc3b7b

Change-Id: I6d366d325fd951302c492e32248d0f6469999225

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 328340e..5895128 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -800,13 +800,6 @@
 SUPPORT_LIBRARY_ROOT := frameworks/support
 endif
 
-#################################################################
-# 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
-HOST_CORE_JARS := $(addsuffix -hostdex,$(TARGET_CORE_JARS))
-
 # Historical SDK version N is stored in $(HISTORICAL_SDK_VERSIONS_ROOT)/N.
 # The 'current' version is whatever this source tree is.
 #

target/product/core_tiny.mk

diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index cea6bce..2fb450d 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -85,13 +85,18 @@
 
 # The order matters
 PRODUCT_BOOT_JARS := \
-    $(TARGET_CORE_JARS) \
+    core-oj \
+    core-libart \
+    conscrypt \
+    okhttp \
     legacy-test \
+    bouncycastle \
     ext \
     framework \
     telephony-common \
     voip-common \
     ims-common \
+    apache-xml \
     nullwebview \
     org.apache.http.legacy.boot