ANDROID: GKI targets sets common_kernel.defconfig.

... instead of DEFCONFIG in build configs. This is
a step towards deprecating build configs.

I did not delete DEFCONFIG from build.config.gki because
it is still sourced downstream.

Also sets check_defconfig_minimized that corresponds to
POST_DEFCONFIG_CMDS=check_defconfig.

Bug: 368119551
Change-Id: Ia5208a1758667223141573c91fbe3a0d20d7c19e
Signed-off-by: HONG Yifan <elsk@google.com>
This commit is contained in:
HONG Yifan
2024-09-25 19:41:55 -07:00
committed by Yifan Hong
parent 6981109fa2
commit afc0b547a6
4 changed files with 53 additions and 4 deletions
+40 -4
View File
@@ -144,14 +144,30 @@ filegroup(
visibility = ["//visibility:public"],
)
# Temp target to fork form build.config.gki.aarch64 which may potentially be
# used elsewhere.
# TODO(b/236012223): Delete this once we have build-config-less builds for GKI.
write_file(
name = "build.config.gki.aarch64_generated",
out = "build.config.gki.aarch64.generated",
content = [
". ${ROOT_DIR}/${KERNEL_DIR}/build.config.common",
". ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64",
"", # keep new line at the end
],
visibility = ["//visibility:private"],
)
common_kernel(
name = "kernel_aarch64",
outs = DEFAULT_GKI_OUTS,
arch = "arm64",
build_config = "build.config.gki.aarch64",
build_config = ":build.config.gki.aarch64_generated",
build_gki_artifacts = True,
check_defconfig_minimized = True,
ddk_headers_archive = ":kernel_aarch64_ddk_headers_archive",
ddk_module_headers = [":all_headers_aarch64"],
defconfig = "arch/arm64/configs/gki_defconfig",
extra_dist = [
":test_mappings_zip",
":tests_zip_arm64",
@@ -180,10 +196,12 @@ common_kernel(
name = "kernel_aarch64_16k",
outs = DEFAULT_GKI_OUTS,
arch = "arm64",
build_config = "build.config.gki.aarch64",
build_config = ":build.config.gki.aarch64_generated",
build_gki_artifacts = True,
check_defconfig_minimized = True,
ddk_headers_archive = ":kernel_aarch64_ddk_headers_archive",
ddk_module_headers = [":all_headers_aarch64"],
defconfig = "arch/arm64/configs/gki_defconfig",
extra_dist = [
":test_mappings_zip",
":tests_zip_arm64",
@@ -210,9 +228,11 @@ common_kernel(
name = "kernel_aarch64_interceptor",
outs = DEFAULT_GKI_OUTS,
arch = "arm64",
build_config = "build.config.gki.aarch64",
build_config = ":build.config.gki.aarch64_generated",
check_defconfig_minimized = True,
ddk_headers_archive = ":kernel_aarch64_ddk_headers_archive",
ddk_module_headers = [":all_headers_aarch64"],
defconfig = "arch/arm64/configs/gki_defconfig",
enable_interceptor = True,
extra_dist = [
":test_mappings_zip",
@@ -225,6 +245,20 @@ common_kernel(
visibility = ["//visibility:public"],
)
# Temp target to fork form build.config.gki.x86_64 which may potentially be
# used elsewhere.
# TODO(b/236012223): Delete this once we have build-config-less builds for GKI.
write_file(
name = "build.config.gki.x86_64_generated",
out = "build.config.gki.x86_64.generated",
content = [
". ${ROOT_DIR}/${KERNEL_DIR}/build.config.common",
". ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64",
"", # keep new line at the end
],
visibility = ["//visibility:private"],
)
fail_rule(
name = "kernel_x86_64_debug",
message = """\
@@ -238,9 +272,11 @@ common_kernel(
name = "kernel_x86_64",
outs = X86_64_OUTS,
arch = "x86_64",
build_config = "build.config.gki.x86_64",
build_config = "build.config.gki.x86_64_generated",
build_gki_artifacts = True,
check_defconfig_minimized = True,
ddk_module_headers = [":all_headers_x86_64"],
defconfig = "arch/x86/configs/gki_defconfig",
extra_dist = [
":test_mappings_zip",
":tests_zip_x86_64",
+3
View File
@@ -1,2 +1,5 @@
echo "WARNING: Do not source build.config.gki.
Use kernel_build.defconfig and kernel_build.check_defconfig instead." >&2
DEFCONFIG=gki_defconfig
POST_DEFCONFIG_CMDS="check_defconfig"
+5
View File
@@ -1,3 +1,8 @@
# Note: This file is no longer used by the GKI to build. The file is kept
# here because of external usages.
# TODO(b/236012223): Deprecate and remove this file once build-config-less
# builds are fully supported.
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.aarch64
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki
+5
View File
@@ -1,3 +1,8 @@
# Note: This file is no longer used by the GKI to build. The file is kept
# here because of external usages.
# TODO(b/236012223): Deprecate and remove this file once build-config-less
# builds are fully supported.
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.common
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.x86_64
. ${ROOT_DIR}/${KERNEL_DIR}/build.config.gki