From 8c9bcaf9a5899435b9cfa4bc00cb42d8560c7402 Mon Sep 17 00:00:00 2001 From: HONG Yifan Date: Wed, 30 Oct 2024 14:46:32 -0700 Subject: [PATCH] ANDROID: Delete build.config.crashdump*. Bug: 236012223 Bug: 376527671 Change-Id: Iad4c0adc690df188f6c5510fc81602e31332947d Signed-off-by: HONG Yifan --- BUILD.bazel | 7 +++++-- build.config.crashdump | 1 - build.config.crashdump.aarch64 | 6 ------ build.config.crashdump.x86_64 | 6 ------ 4 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 build.config.crashdump delete mode 100644 build.config.crashdump.aarch64 delete mode 100644 build.config.crashdump.x86_64 diff --git a/BUILD.bazel b/BUILD.bazel index f31bfa4c1f8b..0685ddecc9e3 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -494,7 +494,9 @@ kernel_build( outs = [ "Image", ], - build_config = "build.config.crashdump.aarch64", + arch = "arm64", + build_config = "build.config.common", + defconfig = "arch/arm64/configs/crashdump_defconfig", make_goals = [ "Image", ], @@ -521,7 +523,8 @@ kernel_build( srcs = [":kernel_x86_64_sources"], outs = X86_64_OUTS, arch = "x86_64", - build_config = "build.config.crashdump.x86_64", + build_config = "build.config.common", + defconfig = "arch/x86/configs/crashdump_defconfig", make_goals = [ "bzImage", ], diff --git a/build.config.crashdump b/build.config.crashdump deleted file mode 100644 index 8a4214358308..000000000000 --- a/build.config.crashdump +++ /dev/null @@ -1 +0,0 @@ -DEFCONFIG=crashdump_defconfig diff --git a/build.config.crashdump.aarch64 b/build.config.crashdump.aarch64 deleted file mode 100644 index 2d0d1000aa0b..000000000000 --- a/build.config.crashdump.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.crashdump - -# No modules -IN_KERNEL_MODULES= diff --git a/build.config.crashdump.x86_64 b/build.config.crashdump.x86_64 deleted file mode 100644 index 3737362fc290..000000000000 --- a/build.config.crashdump.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.crashdump - -# No modules -IN_KERNEL_MODULES=