From 7dceab7d60b0d7adbda6d2a96d721ab3f78170d7 Mon Sep 17 00:00:00 2001
From: HONG Yifan <elsk@google.com>
Date: Wed, 30 Oct 2024 14:26:16 -0700
Subject: [PATCH] ANDROID: delete build.config.microdroid*.

Use the new kernel_build.defconfig attribute to replace DEFCONFIG.

Also, IN_KERNEL_MODULES has no effect, so also delete.

The final result is collapsed to build.config.common, so use it
directly.

Bug: 236012223
Change-Id: I56d2e55d5ea0494bfcf8e6b2c01283e4e40aa81d
Signed-off-by: HONG Yifan <elsk@google.com>
---
 BUILD.bazel                     | 9 ++++++---
 build.config.microdroid         | 1 -
 build.config.microdroid.aarch64 | 6 ------
 build.config.microdroid.x86_64  | 6 ------
 4 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 build.config.microdroid
 delete mode 100644 build.config.microdroid.aarch64
 delete mode 100644 build.config.microdroid.x86_64

diff --git a/BUILD.bazel b/BUILD.bazel
index 797fef6e1433..83b5c1d05dcb 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -402,7 +402,8 @@ kernel_build(
         "vmlinux",
         "vmlinux.symvers",
     ],
-    build_config = "build.config.microdroid.aarch64",
+    build_config = "build.config.common",
+    defconfig = "arch/arm64/configs/microdroid_defconfig",
     make_goals = [
         "Image",
     ],
@@ -435,7 +436,8 @@ kernel_build(
         "vmlinux",
         "vmlinux.symvers",
     ],
-    build_config = "build.config.microdroid.aarch64",
+    build_config = "build.config.common",
+    defconfig = "arch/arm64/configs/microdroid_defconfig",
     make_goals = [
         "Image",
     ],
@@ -465,7 +467,8 @@ kernel_build(
     srcs = [":kernel_x86_64_sources"],
     outs = X86_64_OUTS,
     arch = "x86_64",
-    build_config = "build.config.microdroid.x86_64",
+    build_config = "build.config.common",
+    defconfig = "arch/x86/configs/microdroid_defconfig",
     make_goals = [
         "bzImage",
     ],
diff --git a/build.config.microdroid b/build.config.microdroid
deleted file mode 100644
index d31e0d5587f3..000000000000
--- a/build.config.microdroid
+++ /dev/null
@@ -1 +0,0 @@
-DEFCONFIG=microdroid_defconfig
diff --git a/build.config.microdroid.aarch64 b/build.config.microdroid.aarch64
deleted file mode 100644
index e1a5aaa40796..000000000000
--- a/build.config.microdroid.aarch64
+++ /dev/null
@@ -1,6 +0,0 @@
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.microdroid
-
-# No modules
-IN_KERNEL_MODULES=
diff --git a/build.config.microdroid.x86_64 b/build.config.microdroid.x86_64
deleted file mode 100644
index f463009d91be..000000000000
--- a/build.config.microdroid.x86_64
+++ /dev/null
@@ -1,6 +0,0 @@
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
-. ${ROOT_DIR}/${KERNEL_DIR}/build.config.microdroid
-
-# No modules
-IN_KERNEL_MODULES=