Skip part of the test for __BIONIC__

Author: rprichard

libcxx/test/std/input.output/file.streams/fstreams/filebuf.members/close.pass.cpp

@@ -19,15 +19,6 @@
 #include "test_macros.h"
 #include "platform_support.h"
 
-// If we're building for a lower __ANDROID_API__, the Bionic versioner will
-// omit the function declarations from fdsan.h. We might be running on a newer
-// API level, though, so declare the API function here using weak.
-#if defined(__BIONIC__)
-#include <android/fdsan.h>
-enum android_fdsan_error_level android_fdsan_set_error_level(enum android_fdsan_error_level new_level)
-    __attribute__((weak));
-#endif
-
 int main(int, char**)
 {
     std::string temp = get_temp_file_name();
@@ -41,14 +32,10 @@ int main(int, char**)
         assert(f.close() == nullptr);
         assert(!f.is_open());
     }
-#if defined(__BIONIC__)
-    // Starting with Android API 30+, Bionic's fdsan aborts a process that
-    // attempts to close a file descriptor belonging to something else. Disable
-    // fdsan to allow closing the FD belonging to std::filebuf's FILE*.
-    if (android_fdsan_set_error_level != nullptr)
-        android_fdsan_set_error_level(ANDROID_FDSAN_ERROR_LEVEL_DISABLED);
-#endif
-#if defined(__unix__)
+    // Starting with Android API 30+, Bionic's fdsan aborts a process that calls
+    // close() on a file descriptor tagged as belonging to something else (such
+    // as a FILE*).
+#if defined(__unix__) && !defined(__BIONIC__)
     {
         std::filebuf f;
         assert(!f.is_open());