diff --git a/core/Makefile b/core/Makefile index d9f9a25df..3ed33dc86 100644 --- a/core/Makefile +++ b/core/Makefile @@ -23,8 +23,13 @@ define check-product-copy-files $(if $(filter %.apk, $(1)),$(error \ Prebuilt apk found in PRODUCT_COPY_FILES: $(1), use BUILD_PREBUILT instead!)) endef -unique_product_copy_files_destinations := +# filter out the duplicate : pairs. +unique_product_copy_files_pairs := $(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 := +$(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)) \ @@ -36,6 +41,7 @@ $(foreach cf,$(PRODUCT_COPY_FILES), \ $(eval $(call copy-one-file,$(_src),$(_fulldest)))) \ $(eval ALL_DEFAULT_INSTALLED_MODULES += $(_fulldest)) \ $(eval unique_product_copy_files_destinations += $(_dest)))) +unique_product_copy_files_pairs := unique_product_copy_files_destinations := # -----------------------------------------------------------------