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

am: cc33b6005f

Change-Id: I2f7465d6bd723c85aa0c028e8e8268d631c13d02

core/config.mk

@@ -803,13 +803,6 @@ else
 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

@@ -87,13 +87,18 @@ PRODUCT_PACKAGES += \
 
 # 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 \
     android.hidl.base-V1.0-java \