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

Commit 17c6af46 authored by Jiakai Zhang's avatar Jiakai Zhang
Browse files

Add a Make variable that overrides configured jar locations. 

Bug: 290583827
Test: m nothing
Change-Id: I9a23d6a033d50d2a8c5d9e8dd79d00033efa1f53
parent 7a3ff6b3

core/product.mk

+4 −0
Original line number Diff line number Diff line
@@ -317,6 +317,10 @@ _product_list_vars += PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES 
_product_list_vars += PRODUCT_PACKAGE_NAME_OVERRIDES

_product_list_vars += PRODUCT_CERTIFICATE_OVERRIDES



# Overrides the (apex, jar) pairs above when determining the on-device location. The format is:

# <old_apex>:<old_jar>:<new_apex>:<new_jar>

_product_list_vars += PRODUCT_CONFIGURED_JAR_LOCATION_OVERRIDES



# Controls for whether different partitions are built for the current product.

_product_single_value_vars += PRODUCT_BUILD_SYSTEM_IMAGE

_product_single_value_vars += PRODUCT_BUILD_SYSTEM_OTHER_IMAGE

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ $(call add_json_bool, WithDexpreopt, $(filter true,$(WITH_DE 
$(call add_json_list, ManifestPackageNameOverrides,      $(PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES))

$(call add_json_list, PackageNameOverrides,              $(PRODUCT_PACKAGE_NAME_OVERRIDES))

$(call add_json_list, CertificateOverrides,              $(PRODUCT_CERTIFICATE_OVERRIDES))

$(call add_json_list, ConfiguredJarLocationOverrides,    $(PRODUCT_CONFIGURED_JAR_LOCATION_OVERRIDES))



$(call add_json_str, ApexGlobalMinSdkVersionOverride,    $(APEX_GLOBAL_MIN_SDK_VERSION_OVERRIDE))

target/product/default_art_config.mk

+5 −0
Original line number Diff line number Diff line
@@ -106,6 +106,11 @@ PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \ 
    com.android.uwb:service-uwb \

    com.android.wifi:service-wifi \



# Overrides the (apex, jar) pairs above when determining the on-device location. The format is:

# <old_apex>:<old_jar>:<new_apex>:<new_jar>

PRODUCT_CONFIGURED_JAR_LOCATION_OVERRIDES := \

    platform:framework-minus-apex:platform:framework \



# Minimal configuration for running dex2oat (default argument values).

# PRODUCT_USES_DEFAULT_ART_CONFIG must be true to enable boot image compilation.

PRODUCT_USES_DEFAULT_ART_CONFIG := true