Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3795d6d authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Improve error message for artifacts outside requirement" am: 82a8507e am: 67b4485e 

am: 301beccb

Change-Id: I1f297ae5536896c88b1979608f5deadef61cb021
parents 09874b92 301beccb

core/main.mk

+3 −1
Original line number Diff line number Diff line
@@ -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.) \