diff options
| author | 2020-03-23 15:35:00 +0000 | |
|---|---|---|
| committer | 2020-03-24 17:09:47 +0000 | |
| commit | c282ece0445fcfd30270c23ff66ef6db0c86d078 (patch) | |
| tree | 31292a154e2008a49a7767a5be00f6c692f5f4df | |
| parent | a113ba1b352721bb3008570e0e0b1656f288975e (diff) | |
Get rid of obsolete Make variable TARGET_CORE_JARS.
Test: aosp_walleye-userdebug boots.
Bug: 147579140
Change-Id: Ibed8c8479b9c1f3ac333c66aeddea4f5f06c9aad
Merged-In: Ibed8c8479b9c1f3ac333c66aeddea4f5f06c9aad
(cherry picked from commit c46e0673d0568861a634456f72bac2de9805b990)
| -rw-r--r-- | core/envsetup.mk | 2 | ||||
| -rw-r--r-- | target/product/base_system.mk | 4 | ||||
| -rw-r--r-- | target/product/runtime_libart.mk | 7 |
3 files changed, 3 insertions, 10 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 04a970ffde..862d874680 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -259,8 +259,6 @@ endef # Jars present in the ART apex. These should match exactly the list of # Java libraries in the ART apex build rule. ART_APEX_JARS := core-oj core-libart core-icu4j okhttp bouncycastle apache-xml -TARGET_CORE_JARS := $(ART_APEX_JARS) conscrypt -HOST_CORE_JARS := $(addsuffix -hostdex,$(TARGET_CORE_JARS)) ################################################################# # Read the product specs so we can get TARGET_DEVICE and other diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 77a5d537f2..5ff92ac48c 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -312,8 +312,8 @@ PRODUCT_HOST_PACKAGES += \ tz_version_host \ tz_version_host_tzdata_apex \ -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 for runtime class lookup performance. diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index b59feafc48..1fff8b08c8 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -16,10 +16,6 @@ # Provides a functioning ART environment without Android frameworks -ifeq ($(TARGET_CORE_JARS),) -$(error TARGET_CORE_JARS is empty; cannot update PRODUCT_PACKAGES variable) -endif - # Additional mixins to the boot classpath. PRODUCT_PACKAGES += \ android.test.base \ @@ -33,8 +29,7 @@ PRODUCT_PACKAGES += com.android.runtime # ART APEX module. # Note that this package includes the minimal boot classpath JARs (listed in -# TARGET_CORE_JARS), which should no longer be added directly to -# PRODUCT_PACKAGES. +# ART_APEX_JARS), which should no longer be added directly to PRODUCT_PACKAGES. PRODUCT_PACKAGES += com.android.art PRODUCT_HOST_PACKAGES += com.android.art |