Merge "Improve error message for artifacts outside requirement"
am: 82a8507e17
Change-Id: I8d49c6b2231147086439f9969fa18c67141621f3
This commit is contained in:
commit
67b4485ee7
|
@ -1353,7 +1353,9 @@ $(call dist-for-goals,droidcore,$(CERTIFICATE_VIOLATION_MODULES_FILENAME))
|
|||
$(eval whitelist_patterns := $(call resolve-product-relative-paths,$(whitelist))) \
|
||||
$(eval files := $(call product-installed-files, $(makefile))) \
|
||||
$(eval offending_files := $(filter-out $(path_patterns) $(whitelist_patterns) $(static_whitelist_patterns),$(files))) \
|
||||
$(call maybe-print-list-and-error,$(offending_files),$(makefile) produces files outside its artifact path requirement.) \
|
||||
$(call maybe-print-list-and-error,$(offending_files),\
|
||||
$(makefile) produces files outside its artifact path requirement. \
|
||||
Allowed paths are $(subst $(space),$(comma)$(space),$(addsuffix *,$(requirements)))) \
|
||||
$(eval unused_whitelist := $(filter-out $(files),$(whitelist_patterns))) \
|
||||
$(call maybe-print-list-and-error,$(unused_whitelist),$(makefile) includes redundant whitelist entries in its artifact path requirement.) \
|
||||
$(eval ### Optionally verify that nothing else produces files inside this artifact path requirement.) \
|
||||
|
|
Loading…
Reference in New Issue