commit 74e7a2dbeb05df4e2047bc8bd5bdba49835d03aa
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 04 02:27:00 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 04 02:27:01 2017 +0000
tree e2409ddbcc84ec8d853d940083e07d6188b2d515
parent 7ef1ce5eb815c49308d4e5fd8e5dab9c006ff395
parent 2a209997e8b4eee2b4571d569b1995f29b8e111d

Merge "Use product-based inclusive rule for enforcing RRO" into oc-dev

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 4fbfc73..8768b0b 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -503,7 +503,7 @@
 ADDITIONAL_BUILD_PROPERTIES := $(strip $(ADDITIONAL_BUILD_PROPERTIES))
 .KATI_READONLY := ADDITIONAL_BUILD_PROPERTIES
 
-ifeq ($(BOARD_ENFORCE_RRO),true)
+ifneq ($(PRODUCT_ENFORCE_RRO_TARGETS),)
 ENFORCE_RRO_SOURCES :=
 endif
 
@@ -577,7 +577,7 @@
 # Enforce to generate all RRO packages for modules having resource
 # overlays.
 # -------------------------------------------------------------------
-ifeq ($(BOARD_ENFORCE_RRO),true)
+ifneq ($(PRODUCT_ENFORCE_RRO_TARGETS),)
 $(call generate_all_enforce_rro_packages)
 endif
 

core/package_internal.mk

diff --git a/core/package_internal.mk b/core/package_internal.mk
index 8a31552..bcdc72e 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -97,9 +97,11 @@
       $(addprefix $(dir)/, $(LOCAL_RESOURCE_DIR)))))
 
 enforce_rro_enabled :=
-ifeq ($(BOARD_ENFORCE_RRO),true)
-  ifeq (,$(filter $(LOCAL_PACKAGE_NAME), $(BOARD_ENFORCE_RRO_EXEMPT_SOURCES)))
-    ifneq ($(package_resource_overlays),)
+ifneq ($(PRODUCT_ENFORCE_RRO_TARGETS),)
+  ifneq ($(package_resource_overlays),)
+    ifeq ($(PRODUCT_ENFORCE_RRO_TARGETS),*)
+      enforce_rro_enabled := true
+    else ifneq (,$(filter $(LOCAL_PACKAGE_NAME), $(PRODUCT_ENFORCE_RRO_TARGETS)))
       enforce_rro_enabled := true
     endif
   endif
@@ -702,4 +704,4 @@
     $(enforce_rro_use_res_lib), \
     $(package_resource_overlays) \
     )
-endif  # enforce_rro_enabled
\ No newline at end of file
+endif  # enforce_rro_enabled

core/product.mk

diff --git a/core/product.mk b/core/product.mk
index eeaf700..1e5a30e 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -94,6 +94,7 @@
     PRODUCT_EXTRA_RECOVERY_KEYS \
     PRODUCT_PACKAGE_OVERLAYS \
     DEVICE_PACKAGE_OVERLAYS \
+    PRODUCT_ENFORCE_RRO_TARGETS \
     PRODUCT_SDK_ATREE_FILES \
     PRODUCT_SDK_ADDON_NAME \
     PRODUCT_SDK_ADDON_COPY_FILES \

core/product_config.mk

diff --git a/core/product_config.mk b/core/product_config.mk
index 5675f2f..57b7669 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -425,3 +425,7 @@
 # Whether the product is an Android Things variant.
 PRODUCT_IOT := \
     $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_IOT))
+
+# Package list to apply enforcing RRO.
+PRODUCT_ENFORCE_RRO_TARGETS := \
+    $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_RRO_TARGETS))