Merge "Allow setting PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to false"
This commit is contained in:
@@ -22,6 +22,10 @@ ifeq (true,$(BOARD_USES_SYSTEM_OTHER_ODEX))
|
||||
$(TARGET_OUT_SYSTEM_OTHER)/%.art
|
||||
endif
|
||||
|
||||
ifneq (,$(filter-out true false relaxed strict,$(PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS))$(filter-out 1 0,$(words $(PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS))))
|
||||
$(error PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS must be one of [true, false, relaxed, strict], found: $(PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS))
|
||||
endif
|
||||
|
||||
all_offending_files :=
|
||||
$(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\
|
||||
$(eval requirements := $(PRODUCTS.$(makefile).ARTIFACT_PATH_REQUIREMENTS)) \
|
||||
@@ -46,7 +50,7 @@ $(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\
|
||||
$(eval allowed_patterns := $(call resolve-product-relative-paths,$(allowed))) \
|
||||
$(eval offending_files := $(filter-out $(allowed_patterns),$(files_in_requirement))) \
|
||||
$(eval enforcement := $(PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS)) \
|
||||
$(if $(enforcement),\
|
||||
$(if $(filter-out false,$(enforcement)),\
|
||||
$(call maybe-print-list-and-error,$(offending_files),\
|
||||
$(INTERNAL_PRODUCT) produces files inside $(makefile)s artifact path requirement. \
|
||||
$(PRODUCT_ARTIFACT_PATH_REQUIREMENT_HINT)) \
|
||||
|
Reference in New Issue
Block a user