Convert PRODUCT_COPY_FILES to a list
Instead of map to allow duplicate src entries
Test: m soong_generated_vendor_filesystem_test
Bug: 375053752
Change-Id: I8648a98ac9bad3b7cda3f5f5c8922f2f27e06fce
diff --git a/core/soong_config.mk b/core/soong_config.mk
index c0641de..f8dbb56 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -445,10 +445,7 @@
$(call add_json_list, BoardInfoFiles, $(if $(TARGET_BOARD_INFO_FILES),$(TARGET_BOARD_INFO_FILES),$(firstword $(TARGET_BOARD_INFO_FILE) $(wildcard $(TARGET_DEVICE_DIR)/board-info.txt))))
$(call add_json_str, BootLoaderBoardName, $(TARGET_BOOTLOADER_BOARD_NAME))
- $(call add_json_map, ProductCopyFiles)
- $(foreach pair,$(PRODUCT_COPY_FILES),\
- $(call add_json_str,$(word 1,$(subst :, ,$(pair))),$(word 2,$(subst :, ,$(pair)))))
- $(call end_json_map)
+ $(call add_json_list, ProductCopyFiles, $(PRODUCT_COPY_FILES))
$(call end_json_map)