From 3500abc89bb49ba7f71173f735adaee2ca4196f1 Mon Sep 17 00:00:00 2001 From: Sami Tolvanen Date: Sat, 6 Mar 2021 07:53:39 -0800 Subject: [PATCH] ANDROID: build.config: Disable LTO for KASAN and Kprobes builds Disable both LTO_CLANG_THIN and LTO_CLANG_FULL for KASAN and Kprobes builds. Bug: 167259389 Signed-off-by: Sami Tolvanen Change-Id: I0c55b1cf9c8f7d23094230553c266cb5df7801e8 --- build.config.gki_kasan | 5 ++--- build.config.gki_kprobes | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.config.gki_kasan b/build.config.gki_kasan index ace2f87a613b..3e24544b7a7b 100644 --- a/build.config.gki_kasan +++ b/build.config.gki_kasan @@ -10,9 +10,8 @@ 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 LTO_CLANG_THIN \ + -d LTO_CLANG_FULL \ -d CFI_PERMISSIVE \ -d CFI_CLANG \ -d SHADOW_CALL_STACK diff --git a/build.config.gki_kprobes b/build.config.gki_kprobes index d4a7e7ae9cd4..24c58d553d94 100644 --- a/build.config.gki_kprobes +++ b/build.config.gki_kprobes @@ -2,9 +2,8 @@ DEFCONFIG=gki_defconfig POST_DEFCONFIG_CMDS="check_defconfig && update_kprobes_config" function update_kprobes_config() { ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \ - -d LTO \ -d LTO_CLANG_THIN \ - -d CFI \ + -d LTO_CLANG_FULL \ -d CFI_PERMISSIVE \ -d CFI_CLANG \ -e CONFIG_DYNAMIC_FTRACE \