From 8faefbf00d39e567c937a856701238cabe0ae3eb Mon Sep 17 00:00:00 2001
From: HONG Yifan <elsk@google.com>
Date: Fri, 1 Nov 2024 11:24:07 -0700
Subject: [PATCH] ANDROID: reduce content in build.config.db845c.

All configs except DTC_FLAGS is moved to BUILD.bazel.

As a side effect of setting kernel_build(defconfig), Kleaf enforces that
the final .config has all values required by db845c_gki.fragment. If
that causes build errors like the following in the future, we should
either fix db845c_gki.fragment, or set
kernel_build(check_defconfig = "disabled").

    ERROR: CONFIG_USB_ROLE_SWITCH: actual 'y', expected 'm' from common/arch/arm64/configs/db845c_gki.fragment

Bug: 236012223
Change-Id: Id5b3f264e690176ac59846d32e0d6c62600a8190
Signed-off-by: HONG Yifan <elsk@google.com>
---
 BUILD.bazel         | 6 ++++++
 build.config.db845c | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/BUILD.bazel b/BUILD.bazel
index ec307b21fd69..f31bfa4c1f8b 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -795,9 +795,11 @@ kernel_build(
         "arch/arm64/boot/dts/qcom/sm8650-hdk.dtb",
         "arch/arm64/boot/dts/qcom/sm8650-qrd.dtb",
     ],
+    arch = "arm64",
     # Enable mixed build.
     base_kernel = ":kernel_aarch64",
     build_config = "build.config.db845c",
+    defconfig = "arch/arm64/configs/gki_defconfig",
     make_goals = [
         "modules",
         "qcom/qrb5165-rb5.dtb",
@@ -811,6 +813,7 @@ kernel_build(
     ],
     makefile = ":Makefile",
     module_outs = _DB845C_MODULE_OUTS + _DB845C_WATCHDOG_MODULE_OUTS,
+    pre_defconfig_fragments = ["arch/arm64/configs/db845c_gki.fragment"],
     strip_modules = True,
 )
 
@@ -827,9 +830,11 @@ kernel_build(
         "arch/arm64/boot/dts/qcom/sm8650-hdk.dtb",
         "arch/arm64/boot/dts/qcom/sm8650-qrd.dtb",
     ],
+    arch = "arm64",
     # Enable mixed build.
     base_kernel = ":kernel_aarch64",
     build_config = "build.config.db845c",
+    defconfig = "arch/arm64/configs/gki_defconfig",
     make_goals = [
         "modules",
         "qcom/qrb5165-rb5.dtb",
@@ -843,6 +848,7 @@ kernel_build(
     ],
     makefile = ":Makefile",
     module_outs = _DB845C_MODULE_OUTS,
+    pre_defconfig_fragments = ["arch/arm64/configs/db845c_gki.fragment"],
     strip_modules = True,
 )
 
diff --git a/build.config.db845c b/build.config.db845c
index 09dfe2cf0279..988b23d0f503 100644
--- a/build.config.db845c
+++ b/build.config.db845c
@@ -1,10 +1,3 @@
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
-
-BUILD_INITRAMFS=1
-DEFCONFIG=db845c_gki_defconfig
-FRAGMENT_CONFIG=${KERNEL_DIR}/arch/arm64/configs/db845c_gki.fragment
-PRE_DEFCONFIG_CMDS="KCONFIG_CONFIG=${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/gki_defconfig ${ROOT_DIR}/${FRAGMENT_CONFIG}"
-POST_DEFCONFIG_CMDS="rm ${ROOT_DIR}/${KERNEL_DIR}/arch/arm64/configs/${DEFCONFIG}"
 
 DTC_FLAGS="${DTC_FLAGS} -@"