Merge "Define mte_supported() on non-aarch64."
diff --git a/libc/Android.bp b/libc/Android.bp
index ff3b3b1..4e5ae75 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1774,6 +1774,7 @@
"//system/core/debuggerd:__subpackages__",
"//system/core/libunwindstack:__subpackages__",
"//system/memory/libmemunreachable:__subpackages__",
+ "//tools/security/sanitizer-status:__subpackages__",
],
vendor_available: true,
ramdisk_available: true,
diff --git a/libc/platform/bionic/mte.h b/libc/platform/bionic/mte.h
index fbf3895..1e393eb 100644
--- a/libc/platform/bionic/mte.h
+++ b/libc/platform/bionic/mte.h
@@ -31,16 +31,14 @@
#include <sys/auxv.h>
#include <bionic/mte_kernel.h>
-#ifdef __aarch64__
inline bool mte_supported() {
-#ifdef ANDROID_EXPERIMENTAL_MTE
+#if defined(__aarch64__) && defined(ANDROID_EXPERIMENTAL_MTE)
static bool supported = getauxval(AT_HWCAP2) & HWCAP2_MTE;
#else
static bool supported = false;
#endif
return supported;
}
-#endif
#ifdef __aarch64__
class ScopedDisableMTE {
