From 403b98aa25b2f81106b0fdca8a38ce6b3b62548b Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 15 Nov 2017 11:13:23 -0800 Subject: [PATCH] Silence PRODUCT_COPY_FILES ignored messages We don't have great alternatives for some of these use cases, so for now just silence them, writing them to $OUT/product_copy_files_ignored.txt (and if `dist' is specified, $DIST_DIR/logs/product_copy_files_ignored.txt) Test: lunch aosp_arm-userdebug; m nothing Test: lunch aosp_arm-userdebug; m dist Change-Id: If0228bc8d907346e3505ae136cb477ef37a5c867 --- core/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index f9f1f94e8..a6c948788 100644 --- a/core/Makefile +++ b/core/Makefile @@ -31,12 +31,13 @@ $(foreach cf,$(PRODUCT_COPY_FILES), \ $(if $(filter $(unique_product_copy_files_pairs),$(cf)),,\ $(eval unique_product_copy_files_pairs += $(cf)))) unique_product_copy_files_destinations := +product_copy_files_ignored := $(foreach cf,$(unique_product_copy_files_pairs), \ $(eval _src := $(call word-colon,1,$(cf))) \ $(eval _dest := $(call word-colon,2,$(cf))) \ $(call check-product-copy-files,$(cf)) \ $(if $(filter $(unique_product_copy_files_destinations),$(_dest)), \ - $(info PRODUCT_COPY_FILES $(cf) ignored.), \ + $(eval product_copy_files_ignored += $(cf)), \ $(eval _fulldest := $(call append-path,$(PRODUCT_OUT),$(_dest))) \ $(if $(filter %.xml,$(_dest)),\ $(eval $(call copy-xml-file-checked,$(_src),$(_fulldest))),\ @@ -45,6 +46,14 @@ $(foreach cf,$(unique_product_copy_files_pairs), \ $(eval $(call copy-one-file,$(_src),$(_fulldest))))) \ $(eval ALL_DEFAULT_INSTALLED_MODULES += $(_fulldest)) \ $(eval unique_product_copy_files_destinations += $(_dest)))) + +# Dump a list of overriden (and ignored PRODUCT_COPY_FILES entries) +$(file >$(PRODUCT_OUT)/product_copy_files_ignored.txt,$(subst $(space),$(newline),$(strip $(product_copy_files_ignored)))) +ifdef dist_goal +$(file >$(DIST_DIR)/logs/product_copy_files_ignored.txt,$(subst $(space),$(newline),$(strip $(product_copy_files_ignored)))) +endif + +product_copy_files_ignored := unique_product_copy_files_pairs := unique_product_copy_files_destinations :=