From 31743404560f9449979fd500282490c52ed5164e Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <pcc@google.com>
Date: Wed, 25 Jan 2023 16:59:53 -0800
Subject: [PATCH] Temporarily disable KASAN until bugfix is merged into Shusky
 kernel.

Bug: 265863271
Change-Id: Ifdc9f910767406c4c37600a0b14f502e90bab0aa
---
 BoardConfig-common.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 42b24b1a..508d4971 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -39,6 +39,9 @@ BOARD_KERNEL_CMDLINE += cgroup_disable=memory
 BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all
 BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on
 BOARD_KERNEL_CMDLINE += swiotlb=1024
+# TODO(pcc): Remove this once the shusky kernel is updated with
+# https://android-review.git.corp.google.com/q/topic:%22kasan-mte-sampling-again%22
+BOARD_KERNEL_CMDLINE += kasan=off
 BOARD_BOOTCONFIG += androidboot.boot_devices=13200000.ufs
 
 TARGET_NO_BOOTLOADER := true