From ed18ac2d4a37850f00331022a5500e95b722a233 Mon Sep 17 00:00:00 2001
From: Max Spector <mspector@google.com>
Date: Wed, 22 Apr 2020 15:51:07 -0700
Subject: [PATCH] ANDROID: KASAN support for GKI

Bug: 152792812
Change-Id: I5df3c44129c61218d3a00a4e6e4e8ce7bad81c19
Signed-off-by: Max Spector <mspector@google.com>
---
 build.config.gki.aarch64_kasan | 11 +++++++++++
 build.config.gki.x86_64_kasan  |  4 ++++
 build.config_kasan.gki         | 24 ++++++++++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 build.config.gki.aarch64_kasan
 create mode 100644 build.config.gki.x86_64_kasan
 create mode 100644 build.config_kasan.gki

diff --git a/build.config.gki.aarch64_kasan b/build.config.gki.aarch64_kasan
new file mode 100644
index 000000000000..ded6b25cc2b0
--- /dev/null
+++ b/build.config.gki.aarch64_kasan
@@ -0,0 +1,11 @@
+. ${ROOT_DIR}/common/build.config.common
+. ${ROOT_DIR}/common/build.config.aarch64
+. ${ROOT_DIR}/common/build.config_kasan.gki
+
+ABI_DEFINITION=abi_gki_aarch64.xml
+KMI_WHITELIST=abi_gki_aarch64_whitelist
+ADDITIONAL_KMI_WHITELISTS="
+abi_gki_aarch64_cuttlefish_whitelist
+abi_gki_aarch64_qcom_whitelist
+"
+TRIM_NONLISTED_KMI=1
diff --git a/build.config.gki.x86_64_kasan b/build.config.gki.x86_64_kasan
new file mode 100644
index 000000000000..c748562784d4
--- /dev/null
+++ b/build.config.gki.x86_64_kasan
@@ -0,0 +1,4 @@
+. ${ROOT_DIR}/common/build.config.common
+. ${ROOT_DIR}/common/build.config.x86_64
+. ${ROOT_DIR}/common/build.config_kasan.gki
+
diff --git a/build.config_kasan.gki b/build.config_kasan.gki
new file mode 100644
index 000000000000..bc476a026992
--- /dev/null
+++ b/build.config_kasan.gki
@@ -0,0 +1,24 @@
+DEFCONFIG=gki_defconfig
+POST_DEFCONFIG_CMDS="check_defconfig && update_kasan_config"
+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 \
+         -d CONFIG_KASAN_OUTLINE \
+         -d CONFIG_CC_WERROR \
+         --set-val CONFIG_FRAME_WARN 0 \
+         -d LTO \
+         -d LTO_CLANG \
+         -d CFI \
+         -d CFI_PERMISSIVE \
+         -d CFI_CLANG \
+         -d SHADOW_CALL_STACK
+    (cd ${OUT_DIR} && \
+     make ${CC_LD_ARG} O=${OUT_DIR} olddefconfig)
+}
+