Merge "Add persistent GWP-ASan sysprops."
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 08fac4f..18e8bbc 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -38,6 +38,9 @@
},
{
"name": "memunreachable_unit_test"
+ },
+ {
+ "name": "toybox-tests"
}
],
"hwasan-presubmit": [
@@ -76,6 +79,9 @@
},
{
"name": "memunreachable_unit_test"
+ },
+ {
+ "name": "toybox-tests"
}
]
}
diff --git a/libc/include/android/api-level.h b/libc/include/android/api-level.h
index ecf318d..650bb95 100644
--- a/libc/include/android/api-level.h
+++ b/libc/include/android/api-level.h
@@ -154,6 +154,9 @@
/** Names the "T" API level (33), for comparison against `__ANDROID_API__`. */
#define __ANDROID_API_T__ 33
+/** Names the "U" API level (34), for comparison against `__ANDROID_API__`. */
+#define __ANDROID_API_U__ 34
+
/* This file is included in <features.h>, and might be used from .S files. */
#if !defined(__ASSEMBLY__)