StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I826b1ec6,I0667ef0e,Ie4481513 into main am: da669fa5f0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3247886

Change-Id: I499de7eb93d7399ae10b81918295838bb6e9505d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2024-08-29 22:14:19 +00:00
committed by Automerger Merge Worker
parent d8071df130 da669fa5f0
commit 3c9e58c565
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/board_config.mk
View File

@@ -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)

4
core/dumpconfig.mk
View File

@@ -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:
@@ -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: