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

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

Merge "Dump artifacts offending path reqs into a file" 

am: 7b4b1b15

Change-Id: Id661c2785ffddb053499cbfa3e0dd281cb609907
parents 0b3a91c1 7b4b1b15

core/main.mk

+9 −5
Original line number Original line Diff line number Diff line
@@ -1005,17 +1005,21 @@ $(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\ 
  $(eval unused_whitelist := $(filter-out $(files),$(whitelist_patterns))) \

  $(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.) \

  $(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.) \

  $(eval ### Optionally verify that nothing else produces files inside this artifact path requirement.) \

  $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS),\

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

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

  $(eval files_in_requirement := $(filter $(path_patterns),$(extra_files))) \

  $(eval all_offending_files += $(files_in_requirement)) \

  $(eval whitelist := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST)) \

  $(eval whitelist := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST)) \

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

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

    $(eval files_in_requirement := $(filter $(path_patterns),$(extra_files))) \

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

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

  $(if $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS),\

    $(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.) \

    $(eval unused_whitelist := $(filter-out $(extra_files),$(whitelist_patterns))) \

    $(eval unused_whitelist := $(filter-out $(extra_files),$(whitelist_patterns))) \

    $(call maybe-print-list-and-error,$(unused_whitelist),$(INTERNAL_PRODUCT) includes redundant artifact path requirement whitelist entries.) \

    $(call maybe-print-list-and-error,$(unused_whitelist),$(INTERNAL_PRODUCT) includes redundant artifact path requirement whitelist entries.) \

  ) \

  ) \

)

)

$(PRODUCT_OUT)/offending_artifacts.txt:

	rm -f $@

	$(foreach f,$(sort $(all_offending_files)),echo $(f) >> $@;)





ifeq (0,1)

ifeq (0,1)

  $(info product_FILES for $(TARGET_DEVICE) ($(INTERNAL_PRODUCT)):)

  $(info product_FILES for $(TARGET_DEVICE) ($(INTERNAL_PRODUCT)):)