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

Commit 5a5d66e9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Deprecate PRODUCT_ENFORCE_RRO_EXEMPTED_TARGETS" am: 3f631cf2 

Original change: https://android-review.googlesource.com/c/platform/build/+/1595713

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I457e29bc9a695bd626431b22900c0fac14f56734
parents b4b11448 3f631cf2

core/package_internal.mk

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

core/product.mk

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

core/product_config.mk

+5 −0
Original line number Diff line number Diff line
@@ -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)))),,\

core/soong_config.mk

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