From 7304f8a0e0e15d39c8e652edfd1b1645060ddc5f Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Mon, 21 Mar 2022 11:51:24 -0700 Subject: [PATCH] ANDROID: build.config: re-disable LTO properly for KASAN build.config.gki_kasan was not setting the correct configs to disable LTO for KASAN builds, since the configs differ between when LTO support was first created downstream vs what landed upstream. These builds are large and take a long time to build with LTO added. CONFIG_LTO and CONFIG_LTO_CLANG are not user selectable. Instead, set LTO=none which build.sh will interpret then properly disable CONFIG_LTO_CLANG_FULL, CONFIG_LTO_CLANG_THIN, and enable CONFIG_LTO_NONE. Bug: 225394140 Suggested-by: Nathan Chancellor Signed-off-by: Nick Desaulniers Change-Id: I79d1ea94b04d0a55afeb8df2874aeb7099bb030c --- build.config.gki_kasan | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.config.gki_kasan b/build.config.gki_kasan index 6d9de7ed8a40..1aca62c3a13b 100644 --- a/build.config.gki_kasan +++ b/build.config.gki_kasan @@ -1,6 +1,8 @@ DEFCONFIG=gki_defconfig POST_DEFCONFIG_CMDS="check_defconfig && update_kasan_config" KERNEL_DIR=common +LTO=none + function update_kasan_config() { ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \ -e CONFIG_KASAN \ @@ -10,8 +12,6 @@ function update_kasan_config() { -d CONFIG_RANDOMIZE_BASE \ -d CONFIG_KASAN_OUTLINE \ --set-val CONFIG_FRAME_WARN 0 \ - -d LTO \ - -d LTO_CLANG \ -d CFI \ -d CFI_PERMISSIVE \ -d CFI_CLANG \