Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c282ece0 authored by Ulya Trafimovich's avatar Ulya Trafimovich Committed by Ulyana Trafimovich
Browse files

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 c46e0673)
parent a113ba1b

core/envsetup.mk

+0 −2
Original line number Diff line number Diff line
@@ -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

target/product/base_system.mk

+2 −2
Original line number Diff line number Diff line
@@ -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.

target/product/runtime_libart.mk

+1 −6
Original line number Diff line number Diff line
@@ -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