StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use product-based inclusive rule for enforcing RRO"

Browse Source
This commit is contained in:
Treehugger Robot
2017-04-04 04:34:35 +00:00
committed by Gerrit Code Review
parent 41febee0cc 1b2242895e
commit 4f566f3f97
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/main.mk
View File

@@ -497,7 +497,7 @@ ADDITIONAL_DEFAULT_PROPERTIES := $(strip $(ADDITIONAL_DEFAULT_PROPERTIES))
ADDITIONAL_BUILD_PROPERTIES := $(strip $(ADDITIONAL_BUILD_PROPERTIES)) ADDITIONAL_BUILD_PROPERTIES := $(strip $(ADDITIONAL_BUILD_PROPERTIES))
.KATI_READONLY := ADDITIONAL_BUILD_PROPERTIES .KATI_READONLY := ADDITIONAL_BUILD_PROPERTIES
ifeq ($(BOARD_ENFORCE_RRO),true) ifneq ($(PRODUCT_ENFORCE_RRO_TARGETS),)
ENFORCE_RRO_SOURCES := ENFORCE_RRO_SOURCES :=
endif endif
@@ -571,7 +571,7 @@ endif # ONE_SHOT_MAKEFILE
# Enforce to generate all RRO packages for modules having resource # Enforce to generate all RRO packages for modules having resource
# overlays. # overlays.
# ------------------------------------------------------------------- # -------------------------------------------------------------------
ifeq ($(BOARD_ENFORCE_RRO),true) ifneq ($(PRODUCT_ENFORCE_RRO_TARGETS),)
$(call generate_all_enforce_rro_packages) $(call generate_all_enforce_rro_packages)
endif endif

10
core/package_internal.mk
View File

@@ -101,9 +101,11 @@ package_resource_overlays := $(strip \
$(addprefix $(dir)/, $(LOCAL_RESOURCE_DIR))))) $(addprefix $(dir)/, $(LOCAL_RESOURCE_DIR)))))
enforce_rro_enabled := enforce_rro_enabled :=
ifeq ($(BOARD_ENFORCE_RRO),true) ifneq ($(PRODUCT_ENFORCE_RRO_TARGETS),)
ifeq (,$(filter $(LOCAL_PACKAGE_NAME), $(BOARD_ENFORCE_RRO_EXEMPT_SOURCES))) ifneq ($(package_resource_overlays),)
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 enforce_rro_enabled := true
endif endif
endif endif
@@ -693,4 +695,4 @@ $(call append_enforce_rro_sources, \
$(enforce_rro_use_res_lib), \ $(enforce_rro_use_res_lib), \
$(package_resource_overlays) \ $(package_resource_overlays) \
) )
endif # enforce_rro_enabled endif # enforce_rro_enabled

1
core/product.mk
View File

@@ -94,6 +94,7 @@ _product_var_list := \
PRODUCT_EXTRA_RECOVERY_KEYS \ PRODUCT_EXTRA_RECOVERY_KEYS \
PRODUCT_PACKAGE_OVERLAYS \ PRODUCT_PACKAGE_OVERLAYS \
DEVICE_PACKAGE_OVERLAYS \ DEVICE_PACKAGE_OVERLAYS \
PRODUCT_ENFORCE_RRO_TARGETS \
PRODUCT_SDK_ATREE_FILES \ PRODUCT_SDK_ATREE_FILES \
PRODUCT_SDK_ADDON_NAME \ PRODUCT_SDK_ADDON_NAME \
PRODUCT_SDK_ADDON_COPY_FILES \ PRODUCT_SDK_ADDON_COPY_FILES \

4
core/product_config.mk
View File

@@ -424,3 +424,7 @@ PRODUCT_ART_USE_READ_BARRIER := \
# Whether the product is an Android Things variant. # Whether the product is an Android Things variant.
PRODUCT_IOT := \ PRODUCT_IOT := \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).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))