commit 3500abc89bb49ba7f71173f735adaee2ca4196f1
author Sami Tolvanen <samitolvanen@google.com> Sat Mar 06 07:53:39 2021 -0800
committer Alistair Delva <adelva@google.com> Mon Mar 08 00:31:49 2021 +0000
tree cfa54e42e3c15223c8de07c5799759f600d162ea
parent 2519bc872bbd594f2ec923cb0f90582a3c8d2670

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 <samitolvanen@google.com>
Change-Id: I0c55b1cf9c8f7d23094230553c266cb5df7801e8

build.config.gki_kasan

diff --git a/build.config.gki_kasan b/build.config.gki_kasan
index ace2f87..3e24544 100644
--- a/build.config.gki_kasan
+++ b/build.config.gki_kasan
@@ -10,9 +10,8 @@
          -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

build.config.gki_kprobes

diff --git a/build.config.gki_kprobes b/build.config.gki_kprobes
index d4a7e7a..24c58d5 100644
--- a/build.config.gki_kprobes
+++ b/build.config.gki_kprobes
@@ -2,9 +2,8 @@
 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 \