From c5da20e886f646d0fd53beb6286be7cf2349da74 Mon Sep 17 00:00:00 2001 From: Jeongik Cha Date: Fri, 19 Feb 2021 12:13:36 +0900 Subject: [PATCH] Deprecate PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS There is no module relying on PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS Test: m Bug: 150820813 Change-Id: I461ab2654513a3b921bec5d46c39d474b6324ca2 --- core/package_internal.mk | 7 ------- core/product.mk | 3 --- core/product_config.mk | 5 +++++ core/soong_config.mk | 1 - 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/core/package_internal.mk b/core/package_internal.mk index 1b4062429..346ca243e 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -101,7 +101,6 @@ include $(BUILD_SYSTEM)/support_libraries.mk enforce_rro_enabled := ifneq (,$(filter *, $(PRODUCT_ENFORCE_RRO_TARGETS))) # * means all system and system_ext APKs, so enable conditionally based on module path. - # Note that modules in PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS are excluded even if it is '*' # Note that base_rules.mk has not yet been included, so it's likely that only # one of LOCAL_MODULE_PATH and the LOCAL_X_MODULE flags has been set. @@ -120,12 +119,6 @@ else ifneq (,$(filter $(LOCAL_PACKAGE_NAME), $(PRODUCT_ENFORCE_RRO_TARGETS))) enforce_rro_enabled := true endif -# TODO(b/150820813) Some modules depend on static overlay, remove this after eliminating the dependency. -ifneq (,$(filter $(LOCAL_PACKAGE_NAME), $(PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS))) - enforce_rro_enabled := -endif - - product_package_overlays := $(strip \ $(wildcard $(foreach dir, $(PRODUCT_PACKAGE_OVERLAYS), \ $(addprefix $(dir)/, $(LOCAL_RESOURCE_DIR))))) diff --git a/core/product.mk b/core/product.mk index ce9bacff0..dfe4517c0 100644 --- a/core/product.mk +++ b/core/product.mk @@ -195,9 +195,6 @@ _product_list_vars += PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS # Package list to apply enforcing RRO. _product_list_vars += PRODUCT_ENFORCE_RRO_TARGETS -# Packages to skip auto-generating RROs for when PRODUCT_ENFORCE_RRO_TARGETS is set to *. -_product_list_vars += PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS - _product_list_vars += PRODUCT_SDK_ATREE_FILES _product_list_vars += PRODUCT_SDK_ADDON_NAME _product_list_vars += PRODUCT_SDK_ADDON_COPY_FILES diff --git a/core/product_config.mk b/core/product_config.mk index 7b72b5e6d..6d886ec8d 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -401,6 +401,11 @@ endif $(KATI_obsolete_var PRODUCT_USE_PRODUCT_VNDK,Use PRODUCT_PRODUCT_VNDK_VERSION instead) $(KATI_obsolete_var PRODUCT_USE_PRODUCT_VNDK_OVERRIDE,Use PRODUCT_PRODUCT_VNDK_VERSION instead) +ifdef PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS + $(error PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS is deprecated, consider using RRO for \ + $(PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS)) +endif + define product-overrides-config $$(foreach rule,$$(PRODUCT_$(1)_OVERRIDES),\ $$(if $$(filter 2,$$(words $$(subst :,$$(space),$$(rule)))),,\ diff --git a/core/soong_config.mk b/core/soong_config.mk index 156930022..9fdf7b858 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -80,7 +80,6 @@ $(call add_json_str, CrossHostSecondaryArch, $(HOST_CROSS_2ND_ARCH)) $(call add_json_list, DeviceResourceOverlays, $(DEVICE_PACKAGE_OVERLAYS)) $(call add_json_list, ProductResourceOverlays, $(PRODUCT_PACKAGE_OVERLAYS)) $(call add_json_list, EnforceRROTargets, $(PRODUCT_ENFORCE_RRO_TARGETS)) -$(call add_json_list, EnforceRROExemptedTargets, $(PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS)) $(call add_json_list, EnforceRROExcludedOverlays, $(PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS)) $(call add_json_str, AAPTCharacteristics, $(TARGET_AAPT_CHARACTERISTICS))