diff options
| author | Martin Stjernholm <mast@google.com> | 2021-08-17 08:53:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-08-17 08:53:02 +0000 |
| commit | 914c00fa80fd30ef4d3981cb915390b54917d97c (patch) | |
| tree | 8549868e903c5a2ad847a5cbd93a87aef56ef63c | |
| parent | 1b181b06983553c2cc9cccd8e783f6b505abdc33 (diff) | |
| parent | 36444ab0ec4db8ca52177ac93073b1da1d64f00c (diff) | |
| download | build-914c00fa80fd30ef4d3981cb915390b54917d97c.tar.gz | |
Merge "Remove PRODUCT_BOOT_JAR_MODULE_OVERRIDES."
| -rw-r--r-- | core/product.mk | 5 | ||||
| -rw-r--r-- | core/product_config.mk | 13 |
2 files changed, 0 insertions, 18 deletions
diff --git a/core/product.mk b/core/product.mk index f6347e829b..9aaf5eb300 100644 --- a/core/product.mk +++ b/core/product.mk @@ -372,11 +372,6 @@ _product_list_vars += PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES _product_list_vars += PRODUCT_PACKAGE_NAME_OVERRIDES _product_list_vars += PRODUCT_CERTIFICATE_OVERRIDES -# A list of <overridden-apex>:<override-apex> pairs that specifies APEX module -# overrides to be applied to the APEX names in the boot jar variables -# (PRODUCT_BOOT_JARS, PRODUCT_APEX_BOOT_JARS etc). -_product_list_vars += PRODUCT_BOOT_JAR_MODULE_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 diff --git a/core/product_config.mk b/core/product_config.mk index 403c6be130..7bed376dd4 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -285,19 +285,6 @@ PRODUCT_APEX_BOOT_JARS := $(filter-out com.android.i18n:core-icu4j,$(PRODUCT_APE # All APEX jars come after /system and /system_ext jars, so adding core-icu4j at the end of the list PRODUCT_BOOT_JARS += com.android.i18n:core-icu4j -# Replaces references to overridden boot jar modules in a boot jars variable. -# $(1): Name of a boot jars variable with <apex>:<jar> pairs. -define replace-boot-jar-module-overrides - $(foreach pair,$(PRODUCT_BOOT_JAR_MODULE_OVERRIDES),\ - $(eval _rbjmo_from := $(call word-colon,1,$(pair)))\ - $(eval _rbjmo_to := $(call word-colon,2,$(pair)))\ - $(eval $(1) := $(patsubst $(_rbjmo_from):%,$(_rbjmo_to):%,$($(1))))) -endef - -$(call replace-boot-jar-module-overrides,PRODUCT_BOOT_JARS) -$(call replace-boot-jar-module-overrides,PRODUCT_APEX_BOOT_JARS) -$(call replace-boot-jar-module-overrides,ART_APEX_JARS) - # The extra system server jars must be appended at the end after common system server jars. PRODUCT_SYSTEM_SERVER_JARS += $(PRODUCT_SYSTEM_SERVER_JARS_EXTRA) |