From cae07316c96b60159503888d08ecc138d627fb2f Mon Sep 17 00:00:00 2001
From: Ram Muthiah <rammuthiah@google.com>
Date: Mon, 23 Jan 2023 07:29:36 -0800
Subject: [PATCH] ANDROID: GKI: KASAN: disable INLINE

and replace with PANIC_ON_WARN. The latter is needed to align with
the standard KASAN template.

The former is needed to workaround a boot issue on cuttlefish that
hasn't been root-caused yet. Likely cause is the larger text
space needed for the INLINE config.

This issue was surfaced on cuttlefish when the BL implementation
was changed to use a builtin environment 578b47ac41fe4433108.

Bug: 218315905
Change-Id: I57486f8befa720bbf49afe89c5454af8348816a5
---
 build.config.gki_kasan | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.config.gki_kasan b/build.config.gki_kasan
index cd994c0d63af..7081f87906f0 100644
--- a/build.config.gki_kasan
+++ b/build.config.gki_kasan
@@ -4,7 +4,7 @@ KERNEL_DIR=common
 function update_kasan_config() {
     ${KERNEL_DIR}/scripts/config --file ${OUT_DIR}/.config \
          -e CONFIG_KASAN \
-         -e CONFIG_KASAN_INLINE \
+         -e CONFIG_KASAN_PANIC_ON_WARN \
          -e CONFIG_KCOV \
          -e CONFIG_PANIC_ON_WARN_DEFAULT_ENABLE \
          -d CONFIG_RANDOMIZE_BASE \