From 22bcc407387ec0f031c83ab13d8f116a41ef4912 Mon Sep 17 00:00:00 2001
From: Yumi Yukimura <me.cafebabe@gmail.com>
Date: Tue, 24 Dec 2024 01:11:19 +0800
Subject: [PATCH] build: Move inclusion of BoardConfigExtra.mk to
 board_config.mk

Some kind of extras needs to alter variables that becomes read-only
after inclusion of board_config.mk, or wants some variables getting
processed by board_config.mk. For example, native bridge.

Change-Id: If7ef0dcfc30b52940017662fa7402e4970dbc3c7
---
 core/board_config.mk | 1 +
 core/config.mk       | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/board_config.mk b/core/board_config.mk
index 5606964950..e2c29b2d0a 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -240,6 +240,7 @@ endif
 $(call dump-phase-start,BOARD,,,, build/make/core/board_config.mk)
 ifndef RBC_PRODUCT_CONFIG
 include $(board_config_mk)
+-include vendor/extra/BoardConfigExtra.mk
 else
   $(shell mkdir -p $(OUT_DIR)/rbc)
   $(call dump-variables-rbc, $(OUT_DIR)/rbc/make_vars_pre_board_config.mk)
diff --git a/core/config.mk b/core/config.mk
index 2c0d1ef722..1dbfcf12fc 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -453,7 +453,6 @@ endif
 # See envsetup.mk for a description of SCAN_EXCLUDE_DIRS
 FIND_LEAVES_EXCLUDES := $(addprefix --prune=, $(SCAN_EXCLUDE_DIRS) .repo .git)
 
--include vendor/extra/BoardConfigExtra.mk
 ifneq ($(LINEAGE_BUILD),)
 include vendor/lineage/config/BoardConfigLineage.mk
 endif