Merge tag 'android-13.0.0_r52' of https://android.googlesource.com/platform/bionic into t13.0HEADt13.0

Android 13.0.0 Release 52 (TQ3A.230605.012)

Change-Id: Ic18bc3dfc28e9e23f5a96e2e74843d9e27dbe141

1 files changed, 9 insertions, 0 deletions

diff --git a/tests/gwp_asan_test.cpp b/tests/gwp_asan_test.cpp
index 8e5132304..5f5e3dd17 100644
--- a/tests/gwp_asan_test.cpp
+++ b/tests/gwp_asan_test.cpp
@@ -43,6 +43,15 @@
 // mutation.
 extern "C" const char* __gnu_basename(const char* path);
 
+// GWP-ASan tests can run much slower, especially when combined with HWASan.
+// Triple the deadline to avoid flakes (b/238585984).
+extern "C" bool GetInitialArgs(const char*** args, size_t* num_args) {
+  static const char* initial_args[] = {"--deadline_threshold_ms=270000"};
+  *args = initial_args;
+  *num_args = 1;
+  return true;
+}
+
 // This file implements "torture testing" under GWP-ASan, where we sample every
 // single allocation. The upper limit for the number of GWP-ASan allocations in
 // the torture mode is is generally 40,000, so that svelte devices don't