aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2022-02-07 11:50:19 +0100
committerJeffrey Vander Stoep <jeffv@google.com>2022-02-07 10:53:11 +0000
commit23acefc28673b31f6bee5cd79cb5dde9d828c382 (patch)
tree204e335ea4e53824310f67aaf053668304662bc1
parentc9727b8ce3f877e1b658f4368a84bab4d29cccf3 (diff)
downloadconfigs-23acefc28673b31f6bee5cd79cb5dde9d828c382.tar.gz
Disable CONFIG_VMAP_STACK for KASAN builds
Test: treehugger Bug: 117194687 Signed-off-by: Jeff Vander Stoep <jeffv@google.com> Change-Id: I876267ab4e44083215ae313de5e4897b06e9ec49
-rw-r--r--android-5.10/android-base-conditional.xml4
-rw-r--r--android-5.15/android-base-conditional.xml4
2 files changed, 8 insertions, 0 deletions
diff --git a/android-5.10/android-base-conditional.xml b/android-5.10/android-base-conditional.xml
index 9d1e9d8..404044d 100644
--- a/android-5.10/android-base-conditional.xml
+++ b/android-5.10/android-base-conditional.xml
@@ -210,6 +210,10 @@
<key>CONFIG_HAVE_ARCH_VMAP_STACK</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_KASAN_SW_TAGS</key>
+ <value type="bool">n</value>
+ </config>
</conditions>
<config>
<key>CONFIG_VMAP_STACK</key>
diff --git a/android-5.15/android-base-conditional.xml b/android-5.15/android-base-conditional.xml
index 08c572b..c6e47d7 100644
--- a/android-5.15/android-base-conditional.xml
+++ b/android-5.15/android-base-conditional.xml
@@ -218,6 +218,10 @@
<key>CONFIG_HAVE_ARCH_VMAP_STACK</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_KASAN_SW_TAGS</key>
+ <value type="bool">n</value>
+ </config>
</conditions>
<config>
<key>CONFIG_VMAP_STACK</key>