commit 83ba31cd9522e87879451d571eb21e6a9082ae61
author Anton Hansson <hansson@google.com> Fri Oct 12 16:15:49 2018 +0100
committer Anton Hansson <hansson@google.com> Tue Oct 16 07:41:02 2018 +0100
tree 39583b33031cc8b7e8d0489af1611546a4bd8336
parent 0e91bac015fd550ea4fe6fa47fdbccb982f9660d

Allow a hint together with artifact path enforcement

This enables specifying a product-specific error message, to
accompany the otherwise potentially cryptic message.

Bug: 117637311
Bug: 80410283
Test: downstream product
Test: lunch mainline_arm64; m nothing
Change-Id: I9953d44d6338e5a79c5ed651716d3e39647ec87a

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 4b24acc..f26b2bb 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1036,7 +1036,9 @@
     $(eval offending_files := $(filter-out $(whitelist_patterns),$(files_in_requirement))) \
     $(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.) \
+      $(call maybe-print-list-and-error,$(offending_files),\
+        $(INTERNAL_PRODUCT) produces files inside $(makefile)s artifact path requirement. \
+        $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ARTIFACT_PATH_REQUIREMENT_HINT)) \
       $(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.) \