From b34578cf741a2ba6530e6d20d76a48d1abd01cdc Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Fri, 2 Aug 2024 17:49:17 +0000
Subject: [PATCH 1/3] Fix newline for dumpconfig

Test: build/make/ci/dump_product_config
Change-Id: Ie4481513b58f589a00b092114135788b1c4c62cd
---
 core/dumpconfig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/dumpconfig.mk b/core/dumpconfig.mk
index 640fe10f9c..8991d6e0d4 100644
--- a/core/dumpconfig.mk
+++ b/core/dumpconfig.mk
@@ -56,7 +56,7 @@ BUILD_DATETIME_FILE := $(OUT_DIR)/build_date.txt
 
 # Escape quotation marks for CSV, and wraps in quotation marks.
 define escape-for-csv
-"$(subst ","",$1)"
+"$(subst ","",$(subst $(newline), ,$1))"
 endef
 
 # Args:

From 6dfeb795e0f5a5fe8651e4db5c2df6a90beaca0c Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Wed, 10 Jul 2024 18:12:08 -0700
Subject: [PATCH 2/3] Add tracing for board config to dumpconfig

Test: build/make/ci/dump_product_config
Change-Id: I0667ef0e4427d396cedb03eaf2a314a789947e98
---
 core/board_config.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/board_config.mk b/core/board_config.mk
index d3f0493a6c..5606964950 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -237,6 +237,7 @@ else
   .KATI_READONLY := TARGET_DEVICE_DIR
 endif
 
+$(call dump-phase-start,BOARD,,,, build/make/core/board_config.mk)
 ifndef RBC_PRODUCT_CONFIG
 include $(board_config_mk)
 else
@@ -261,6 +262,7 @@ else
 
   include $(OUT_DIR)/rbc/rbc_board_config_results.mk
 endif
+$(call dump-phase-end, build/make/core/board_config.mk)
 
 ifneq (,$(and $(TARGET_ARCH),$(TARGET_ARCH_SUITE)))
   $(error $(board_config_mk) erroneously sets both TARGET_ARCH and TARGET_ARCH_SUITE)

From 248580cb4149ae8bfdc2036080f33c97f55a189a Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@google.com>
Date: Fri, 2 Aug 2024 22:00:02 +0000
Subject: [PATCH 3/3] Add the list of makefiles that were also included by
 product config to dumpconfig.

In this entry, the first list of files is the inherit-product stack, and
the second one is the list of files included by the file at the top of
the stack that just finished processing

Test: build/make/ci/dump_product_config
Change-Id: I826b1ec6fa1319b8f0cdfaacc6ccf999ce93d9f1
---
 core/dumpconfig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/dumpconfig.mk b/core/dumpconfig.mk
index 8991d6e0d4..eb4c822dc5 100644
--- a/core/dumpconfig.mk
+++ b/core/dumpconfig.mk
@@ -68,7 +68,7 @@ endef
 # Args:
 #   $(1): include stack
 define dump-import-done
-$(eval $(file >> $(DUMPCONFIG_FILE),imported,$(strip $(1))))
+$(eval $(file >> $(DUMPCONFIG_FILE),imported,$(strip $(1)),$(filter-out $(1),$(MAKEFILE_LIST))))
 endef
 
 # Args: