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>
This commit is contained in:
committed by
Treehugger Robot
parent
dfc76c4511
commit
7dceab7d60
+6
-3
@@ -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",
|
||||
],
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
DEFCONFIG=microdroid_defconfig
|
||||
@@ -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=
|
||||
@@ -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=
|
||||
Reference in New Issue
Block a user