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

Commit 97361fd9 authored by Jaekyun Seok's avatar Jaekyun Seok Committed by android-build-merger
Browse files

Merge "Support excluding overlays when enforcing RRO" 

am: 28e18624

Change-Id: I6b494a84e9087460e4eadb14cf44c33c820b15e9
parents 5d97be51 28e18624

core/package_internal.mk

+12 −1
Original line number Diff line number Diff line
@@ -122,7 +122,18 @@ ifneq ($(PRODUCT_ENFORCE_RRO_TARGETS),) 
  endif

endif



ifndef enforce_rro_enabled

ifdef enforce_rro_enabled

  ifneq ($(PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS),)

    static_only_resource_overlays := $(filter $(addsuffix %,$(PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS)),$(package_resource_overlays))

    ifneq ($(static_only_resource_overlays),)

      package_resource_overlays := $(filter-out $(static_only_resource_overlays),$(package_resource_overlays))

      LOCAL_RESOURCE_DIR := $(static_only_resource_overlays) $(LOCAL_RESOURCE_DIR)

      ifeq ($(package_resource_overlays),)

        enforce_rro_enabled :=

      endif

    endif

  endif

else

LOCAL_RESOURCE_DIR := $(package_resource_overlays) $(LOCAL_RESOURCE_DIR)

endif

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ _product_var_list := \ 
    PRODUCT_EXTRA_RECOVERY_KEYS \

    PRODUCT_PACKAGE_OVERLAYS \

    DEVICE_PACKAGE_OVERLAYS \

    PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS \

    PRODUCT_ENFORCE_RRO_TARGETS \

    PRODUCT_SDK_ATREE_FILES \

    PRODUCT_SDK_ADDON_NAME \

core/product_config.mk

+4 −0
Original line number Diff line number Diff line
@@ -434,6 +434,10 @@ PRODUCT_ART_USE_READ_BARRIER := \ 
PRODUCT_IOT := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_IOT))



# Resource overlay list which must be excluded from enforcing RRO.

PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS))



# Package list to apply enforcing RRO.

PRODUCT_ENFORCE_RRO_TARGETS := \

    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_RRO_TARGETS))