From 1d1c4f9e259e2d095ceafe9e2a222f3ba466db89 Mon Sep 17 00:00:00 2001
From: Evgeny Eltsin <eaeltsin@google.com>
Date: Tue, 9 Jun 2020 15:49:20 +0200
Subject: [PATCH] Skip android_unsafe_frame_pointer_chase.pthread with native
 bridge

Bug: 167968941
Bug: 161082441
Test: bionic-unit-tests --gtest_filter=android_unsafe_frame_pointer_chase.pthread
Change-Id: I42a8121003be2fbcd1486b0d5281bc60ac67eb22
---
 tests/Android.bp                                  | 3 +++
 tests/android_unsafe_frame_pointer_chase_test.cpp | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/tests/Android.bp b/tests/Android.bp
index 8b1eebc3f..f215e602f 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -308,6 +308,9 @@ cc_test_library {
     cflags: [
         "-fno-omit-frame-pointer",
     ],
+    static_libs: [
+        "libbase",
+    ],
 }
 
 // -----------------------------------------------------------------------------
diff --git a/tests/android_unsafe_frame_pointer_chase_test.cpp b/tests/android_unsafe_frame_pointer_chase_test.cpp
index 7fa50e149..5b436ff81 100644
--- a/tests/android_unsafe_frame_pointer_chase_test.cpp
+++ b/tests/android_unsafe_frame_pointer_chase_test.cpp
@@ -22,6 +22,8 @@
 
 #include "platform/bionic/android_unsafe_frame_pointer_chase.h"
 
+#include "utils.h"
+
 // Prevent tail calls inside recurse.
 __attribute__((weak, noinline)) size_t nop(size_t val) {
   return val;
@@ -94,6 +96,10 @@ static void* BacktraceThread(void*) {
 }
 
 TEST(android_unsafe_frame_pointer_chase, pthread) {
+  // Android11 missed the fix (r.android.com/1382566) so disabling the test.
+  // It will be re-enabled in the next releases.
+  SKIP_WITH_NATIVE_BRIDGE;
+
   pthread_t t;
   ASSERT_EQ(0, pthread_create(&t, nullptr, BacktraceThread, nullptr));
   void* retval;