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

Commit 83ba31cd authored by Anton Hansson's avatar Anton Hansson
Browse files

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
parent 0e91bac0

core/main.mk

+3 −1
Original line number Diff line number Diff line
@@ -1036,7 +1036,9 @@ ifdef FULL_BUILD 
    $(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.) \

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ _product_var_list := \ 
    PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE \

    PRODUCT_USE_LOGICAL_PARTITIONS \

    PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS \

    PRODUCT_ARTIFACT_PATH_REQUIREMENT_HINT \

    PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST \

    PRODUCT_USE_DYNAMIC_PARTITION_SIZE \

    PRODUCT_BUILD_SUPER_PARTITION \