Get rid of obsolete Make variable TARGET_CORE_JARS.
The only difference with ART_APEX_JARS is that TARGET_CORE_JARS
additionally contains conscrypt. Since conscrypt is an updatable
module, it should not be in the PRODUCT_BOOT_JARS anyway.
Test: aosp_walleye-userdebug boots.
Bug: 147579140
Change-Id: I95f9d3abe34df93d486fdc2a5fc65d3013e75a86
Merged-In: I95f9d3abe34df93d486fdc2a5fc65d3013e75a86
(cherry picked from commit e04fcf67f1ccfe52afdba066554da1dd8ed6b7e7)
diff --git a/qemu_base.mk b/qemu_base.mk
index 9bf82b7..798c87e 100644
--- a/qemu_base.mk
+++ b/qemu_base.mk
@@ -107,16 +107,13 @@
device/generic/goldfish/data/etc/config.ini:config.ini \
device/generic/qemu/advancedFeatures.ini:advancedFeatures.ini \
-#$(call inherit-product, $(SRC_TARGET_DIR)/product/core_tiny.mk)
-ifeq ($(TARGET_CORE_JARS),)
-$(error TARGET_CORE_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)
+ifeq ($(ART_APEX_JARS),)
+$(error ART_APEX_JARS is empty; cannot initialize PRODUCT_BOOT_JARS variable)
endif
# The order matters
PRODUCT_BOOT_JARS := \
- $(TARGET_CORE_JARS) \
-
-
+ $(ART_APEX_JARS) \
# The set of packages we want to force 'speed' compilation on.
PRODUCT_DEXPREOPT_SPEED_APPS := \
