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

Commit c0655eb0 authored by Anton Hansson's avatar Anton Hansson
Browse files

Include PRODUCT_COPY_FILES in artifact check. 

The product-installed-files macro is not really thorough - it only
includes packages, but not other files which are included as part of
the build. Extend it to also include PRODUCT_COPY_FILES.

Bug: 80410283
Test: downstream CL
Change-Id: I803c7a59e695c226fa413fa1602ec315ef9886a8
parent 674454f2

core/main.mk

+2 −0
Original line number Diff line number Diff line
@@ -956,6 +956,8 @@ $(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\ 
  $(eval path_patterns := $(call resolve-product-relative-paths,$(requirements),%)) \

  $(eval whitelist_patterns := $(call resolve-product-relative-paths,$(whitelist))) \

  $(eval files := $(call product-installed-files, $(makefile))) \

  $(eval files += $(foreach cf,$(PRODUCTS.$(makefile).PRODUCT_COPY_FILES),\

    $(call append-path,$(PRODUCT_OUT),$(call word-colon,2,$(cf))))) \

  $(eval files := $(filter-out $(TARGET_OUT_FAKE)/% $(HOST_OUT)/%,$(files))) \

  $(eval offending_files := $(filter-out $(path_patterns) $(whitelist_patterns),$(files))) \

  $(call maybe-print-list-and-error,$(offending_files),$(makefile) produces files outside its artifact path requirement.) \