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

Commit fe590192 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Silence PRODUCT_COPY_FILES ignored messages" 

am: 288521a6

Change-Id: Ie0a346d18d3b6d0fa7dc0242f0f1bb6ecdce6aad
parents 029b3b66 288521a6

core/Makefile

+10 −1
Original line number Original line Diff line number Diff line
@@ -31,12 +31,13 @@ $(foreach cf,$(PRODUCT_COPY_FILES), \ 
    $(if $(filter $(unique_product_copy_files_pairs),$(cf)),,\

    $(if $(filter $(unique_product_copy_files_pairs),$(cf)),,\

        $(eval unique_product_copy_files_pairs += $(cf))))

        $(eval unique_product_copy_files_pairs += $(cf))))

unique_product_copy_files_destinations :=

unique_product_copy_files_destinations :=

product_copy_files_ignored :=

$(foreach cf,$(unique_product_copy_files_pairs), \

$(foreach cf,$(unique_product_copy_files_pairs), \

    $(eval _src := $(call word-colon,1,$(cf))) \

    $(eval _src := $(call word-colon,1,$(cf))) \

    $(eval _dest := $(call word-colon,2,$(cf))) \

    $(eval _dest := $(call word-colon,2,$(cf))) \

    $(call check-product-copy-files,$(cf)) \

    $(call check-product-copy-files,$(cf)) \

    $(if $(filter $(unique_product_copy_files_destinations),$(_dest)), \

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

        $(eval _fulldest := $(call append-path,$(PRODUCT_OUT),$(_dest))) \

        $(if $(filter %.xml,$(_dest)),\

        $(if $(filter %.xml,$(_dest)),\

            $(eval $(call copy-xml-file-checked,$(_src),$(_fulldest))),\

            $(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 $(call copy-one-file,$(_src),$(_fulldest))))) \

        $(eval ALL_DEFAULT_INSTALLED_MODULES += $(_fulldest)) \

        $(eval ALL_DEFAULT_INSTALLED_MODULES += $(_fulldest)) \

        $(eval unique_product_copy_files_destinations += $(_dest))))

        $(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_pairs :=

unique_product_copy_files_destinations :=

unique_product_copy_files_destinations :=