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

Commit 3c9e58c5 authored Aug 29, 2024 by Cole Faust Committed by Automerger Merge Worker Aug 29, 2024

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

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>

parents d8071df1 da669fa5

core/board_config.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)

core/dumpconfig.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -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: