diff options
| author | 2018-10-16 06:38:32 +0000 | |
|---|---|---|
| committer | 2018-10-16 06:38:32 +0000 | |
| commit | 0e91bac015fd550ea4fe6fa47fdbccb982f9660d (patch) | |
| tree | 9f5f4bea59dded744f906a0c93ea775c0875d4d6 | |
| parent | 909c332faba489330f55fc58716f6e57ba4d6088 (diff) | |
| parent | 9cdf17241abbc23bf22218e94cdd531b77ae29df (diff) | |
Merge "Allow more relaxed artifact path req enforcement"
| -rw-r--r-- | core/main.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/main.mk b/core/main.mk index 7f673e9a48..4b24acca85 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1034,9 +1034,11 @@ ifdef FULL_BUILD $(eval whitelist := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST)) \ $(eval whitelist_patterns := $(call resolve-product-relative-paths,$(whitelist))) \ $(eval offending_files := $(filter-out $(whitelist_patterns),$(files_in_requirement))) \ - $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS),\ + $(eval enforcement := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS)) \ + $(if $(enforcement),\ $(call maybe-print-list-and-error,$(offending_files),$(INTERNAL_PRODUCT) produces files inside $(makefile)s artifact path requirement.) \ - $(eval unused_whitelist := $(filter-out $(extra_files),$(whitelist_patterns))) \ + $(eval unused_whitelist := $(if $(filter true strict,$(enforcement)),\ + $(foreach p,$(whitelist_patterns),$(if $(filter $(p),$(extra_files)),,$(p))))) \ $(call maybe-print-list-and-error,$(unused_whitelist),$(INTERNAL_PRODUCT) includes redundant artifact path requirement whitelist entries.) \ ) \ ) |