diff --git a/core/config.mk b/core/config.mk
index 328340edb..589512802 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -800,13 +800,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.
 #
diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index cea6bce1a..2fb450dde 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -85,13 +85,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