[llvm-branch-commits] [libcxx] [libc++][Android] Clean up obsolete API carveouts and document LIBCXX-ANDROID-FIXMEs (PR #243692)

Sharjeel Khan via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Tue Nov 17 18:12:58 PST 2026


https://github.com/Sharjeel-Khan updated https://github.com/llvm/llvm-project/pull/243692

>From ee336628eb44424116af3bce5e3c062997ce3485 Mon Sep 17 00:00:00 2001
From: Sharjeel Khan <sharjeelkhan at google.com>
Date: Tue, 17 Nov 2026 16:47:17 -0800
Subject: [PATCH 1/2] [libc++][Android] Clean up pre-API-23 carveouts and
 document LIBCXX-ANDROID-FIXMEs

Due to updating the Android sysroot and compiler in previous upgrades, certain test configurations can be updated by switching them from `UNSUPPORTED` to `XFAIL` and dropping obsolete API carveouts. In addition, document root cause and resolutions for other `LIBCXX-ANDROID-FIXME`.

Assisted-by: Gemini
---
 libcxx/test/configs/llvm-libc++-android.cfg.in    | 15 +++++++--------
 .../extensions/clang/clang_modules_include.gen.py |  5 ++++-
 .../iostream.objects/cin-read-stdio-sync.sh.cpp   |  8 +++++---
 .../stdlib_h.aligned_alloc.compile.pass.cpp       |  2 +-
 .../std/depr/depr.c.headers/stdlib_h.pass.cpp     |  4 +---
 .../depr/depr.c.headers/wctype_h.compile.pass.cpp |  4 +---
 .../directory_entry.obs/file_size.pass.cpp        |  5 +++--
 .../directory_entry.obs/file_type_obs.pass.cpp    |  5 +++--
 .../directory_entry.obs/hard_link_count.pass.cpp  |  5 +++--
 .../rec.dir.itr.members/increment.pass.cpp        |  3 ---
 .../fs.op.funcs/fs.op.copy/copy.pass.cpp          |  5 +++--
 .../fs.op.copy_file/copy_file.pass.cpp            |  5 +++--
 .../create_hard_link.pass.cpp                     |  5 +++--
 .../fs.op.equivalent/equivalent.pass.cpp          |  5 +++--
 .../fs.op.hard_lk_ct/hard_link_count.pass.cpp     |  5 +++--
 .../fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp  |  5 +++--
 .../fs.op.permissions/permissions.pass.cpp        |  7 ++++---
 .../fs.op.funcs/fs.op.status/status.pass.cpp      |  5 +++--
 .../fs.op.symlink_status/symlink_status.pass.cpp  |  5 +++--
 .../iostream.format/ext.manip/get_money.pass.cpp  |  5 ++++-
 .../iostream.format/ext.manip/put_money.pass.cpp  |  5 ++++-
 .../locale-specific_form.pass.cpp                 |  5 ++++-
 .../print.fun/no_file_description.pass.cpp        |  2 --
 .../iostream.format/print.fun/print.file.pass.cpp |  5 ++++-
 .../print.fun/println.file.pass.cpp               |  5 ++++-
 .../print.fun/vprint_nonunicode.file.pass.cpp     |  5 ++++-
 .../print.fun/vprint_unicode.file.pass.cpp        |  5 ++++-
 .../narrow.stream.objects/cin.readmany.sh.cpp     |  8 +++++---
 .../narrow.stream.objects/cin.sh.cpp              |  8 +++++---
 .../cin.sync_with_stdio.sh.cpp                    |  8 +++++---
 .../wide.stream.objects/wcin-imbue.sh.cpp         |  8 +++++---
 .../wide.stream.objects/wcin.readmany.sh.cpp      |  8 +++++---
 .../wide.stream.objects/wcin.sh.cpp               |  8 +++++---
 .../wcin.sync_with_stdio.sh.cpp                   |  8 +++++---
 .../streambuf.put.area/pbump2gig.pass.cpp         |  6 ++++--
 .../stringstream.members/gcount.pass.cpp          |  6 ++++--
 .../cstdlib.aligned_alloc.compile.pass.cpp        |  2 +-
 .../support.runtime/cstdlib.pass.cpp              |  4 +---
 .../ctime.timespec.compile.pass.cpp               |  2 +-
 .../locale.collate.byname/compare.pass.cpp        |  5 ++++-
 .../locale.collate.byname/transform.pass.cpp      |  5 ++++-
 .../locale.ctype.byname/is_1.pass.cpp             |  5 ++++-
 .../locale.ctype.byname/is_many.pass.cpp          |  5 ++++-
 .../locale.ctype.byname/scan_is.pass.cpp          |  5 ++++-
 .../locale.ctype.byname/scan_not.pass.cpp         |  5 ++++-
 .../locale.ctype.byname/tolower_1.pass.cpp        |  5 ++++-
 .../locale.ctype.byname/tolower_many.pass.cpp     |  5 ++++-
 .../locale.ctype.byname/toupper_1.pass.cpp        |  5 ++++-
 .../locale.ctype.byname/toupper_many.pass.cpp     |  5 ++++-
 .../get_long_double_en_US.pass.cpp                |  5 ++++-
 .../get_string_en_US.pass.cpp                     |  5 ++++-
 .../put_long_double_en_US.pass.cpp                |  5 ++++-
 .../put_string_en_US.pass.cpp                     |  5 ++++-
 .../std/re/re.traits/translate_nocase.pass.cpp    |  8 +++++---
 .../test/std/strings/c.strings/cwctype.pass.cpp   |  4 +---
 .../thread.condition.condvar/notify_one.pass.cpp  |  5 ++++-
 .../locale-specific_form.pass.cpp                 |  5 ++++-
 libcxx/test/support/filesystem_test_helper.h      | 14 ++++++--------
 libcxx/utils/libcxx/test/features/platform.py     |  2 ++
 59 files changed, 208 insertions(+), 116 deletions(-)

diff --git a/libcxx/test/configs/llvm-libc++-android.cfg.in b/libcxx/test/configs/llvm-libc++-android.cfg.in
index 8b149207d61d48..dc693298b907d5 100644
--- a/libcxx/test/configs/llvm-libc++-android.cfg.in
+++ b/libcxx/test/configs/llvm-libc++-android.cfg.in
@@ -1,7 +1,6 @@
 # This testing configuration handles running the test suite against LLVM's
 # libc++ using adb on Android.
 
-import re
 import site
 
 site.addsitedir(os.path.join('@LIBCXX_SOURCE_DIR@', 'utils'))
@@ -15,13 +14,13 @@ config.substitutions.append(('%{flags}',
 ))
 
 compile_flags = '-nostdinc++ -I %{target-include-dir} -I %{include-dir} -I %{libcxx-dir}/test/support'
-if re.match(r'i686-linux-android(21|22|23)$', config.target_triple):
-    # 32-bit x86 Android has a bug where the stack is sometimes misaligned.
-    # The problem appears limited to versions before Android N (API 24) and only
-    # __attribute__((constructor)) functions. Compile with -mstackrealign to
-    # work around the bug.
-    # TODO: Consider automatically doing something like this in Clang itself (LIBCXX-ANDROID-FIXME)
-    # See https://github.com/android/ndk/issues/693.
+if config.target_triple == 'i686-linux-android23':
+    # 32-bit x86 Android before Android N (API 24) has a bug where the stack is
+    # sometimes misaligned in __attribute__((constructor)) functions. Compile
+    # with -mstackrealign to work around the bug.
+    # LIBCXX-ANDROID-FIXME: Have the Clang driver pass -mstackrealign
+    # automatically for i686-linux-android23 (or remove once API 23 testing is
+    # dropped); see https://github.com/android/ndk/issues/693.
     compile_flags += ' -mstackrealign'
 config.substitutions.append(('%{compile_flags}', compile_flags))
 
diff --git a/libcxx/test/extensions/clang/clang_modules_include.gen.py b/libcxx/test/extensions/clang/clang_modules_include.gen.py
index ed058cd9085117..7ee199dbe49b0e 100644
--- a/libcxx/test/extensions/clang/clang_modules_include.gen.py
+++ b/libcxx/test/extensions/clang/clang_modules_include.gen.py
@@ -21,7 +21,10 @@
 # UNSUPPORTED: windows
 # UNSUPPORTED: buildhost=windows
 
-# The Android headers don't appear to be compatible with modules yet
+# Building the `std` Clang module against the Android NDK sysroot fails with
+# unresolved `using_if_exists` declarations (e.g. `::time_t` in `<ctime>`) because
+# the Bionic headers are not modularized yet. Re-enable once the NDK sysroot ships
+# a `module.modulemap` or libc++'s modulemap accommodates non-modular Bionic headers.
 # UNSUPPORTED: LIBCXX-ANDROID-FIXME
 
 # TODO: Investigate this failure
diff --git a/libcxx/test/libcxx/input.output/iostream.objects/cin-read-stdio-sync.sh.cpp b/libcxx/test/libcxx/input.output/iostream.objects/cin-read-stdio-sync.sh.cpp
index 6ac88a782ec6e1..803611decc1d36 100644
--- a/libcxx/test/libcxx/input.output/iostream.objects/cin-read-stdio-sync.sh.cpp
+++ b/libcxx/test/libcxx/input.output/iostream.objects/cin-read-stdio-sync.sh.cpp
@@ -11,9 +11,11 @@
 // https://gitlab.com/qemu-project/qemu/-/issues/1963
 // UNSUPPORTED: LIBCXX-PICOLIBC-FIXME
 
-// This test hangs on Android devices that lack shell_v2, which was added in
-// Android N (API 24).
-// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api={{2[1-3]}}
+// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
+// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
+// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
+// remove once API 23 testing is dropped.
+// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // <iostream>
 
diff --git a/libcxx/test/std/depr/depr.c.headers/stdlib_h.aligned_alloc.compile.pass.cpp b/libcxx/test/std/depr/depr.c.headers/stdlib_h.aligned_alloc.compile.pass.cpp
index aec2c7f98af75a..003c9a1436bdc4 100644
--- a/libcxx/test/std/depr/depr.c.headers/stdlib_h.aligned_alloc.compile.pass.cpp
+++ b/libcxx/test/std/depr/depr.c.headers/stdlib_h.aligned_alloc.compile.pass.cpp
@@ -19,7 +19,7 @@
 // XFAIL: target={{.+}}-windows-{{.+}}
 
 // ::aligned_alloc is available starting with Android P (API 28)
-// XFAIL: target={{.+}}-android{{(eabi)?(21|22|23|24|25|26|27)}}
+// XFAIL: target={{.+}}-android{{(eabi)?(23|24|25|26|27)}}
 
 #include <stdlib.h>
 #include <type_traits>
diff --git a/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp b/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp
index 662331558c121b..a13fe2e0b6c1bd 100644
--- a/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp
+++ b/libcxx/test/std/depr/depr.c.headers/stdlib_h.pass.cpp
@@ -9,9 +9,7 @@
 // test <stdlib.h>
 
 // mblen was added in Android API 26.
-// TODO: Switch from UNSUPPORTED to XFAIL once the Android CI Docker sysroot is
-// updated.
-// UNSUPPORTED: LIBCXX-ANDROID-FIXME && target={{.+}}-android{{(eabi)?(21|22|23|24|25)}}
+// XFAIL: target={{.+}}-android{{(eabi)?(23|24|25)}}
 
 #include <stdlib.h>
 #include <cassert>
diff --git a/libcxx/test/std/depr/depr.c.headers/wctype_h.compile.pass.cpp b/libcxx/test/std/depr/depr.c.headers/wctype_h.compile.pass.cpp
index 221c219918614b..62131a333ace8a 100644
--- a/libcxx/test/std/depr/depr.c.headers/wctype_h.compile.pass.cpp
+++ b/libcxx/test/std/depr/depr.c.headers/wctype_h.compile.pass.cpp
@@ -12,9 +12,7 @@
 // XFAIL: LLVM-LIBC-FIXME
 
 // towctrans and wctrans were added in Android API 26.
-// TODO: Switch from UNSUPPORTED to XFAIL once the Android CI Docker sysroot is
-// updated.
-// UNSUPPORTED: LIBCXX-ANDROID-FIXME && target={{.+}}-android{{(eabi)?(21|22|23|24|25)}}
+// XFAIL: target={{.+}}-android{{(eabi)?(23|24|25)}}
 
 // <wctype.h>
 
diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp
index 10829f8a73db1f..1b1cf129c0b9d0 100644
--- a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp
@@ -14,8 +14,9 @@
 // XFAIL: using-built-library-before-llvm-13
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a FIFO file.
-// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api={{21|22|23}}
+// creating a FIFO file in /data/local/tmp. Resolve by guarding FIFO subtests
+// behind a Lit/helper feature check (similar to can-create-symlinks).
+// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
 
diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_type_obs.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_type_obs.pass.cpp
index 071ee7f6c891fa..3c54b407f3497c 100644
--- a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_type_obs.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_type_obs.pass.cpp
@@ -10,8 +10,9 @@
 // UNSUPPORTED: c++03, c++11, c++14
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a hard link.
-// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api={{21|22|23}}
+// creating a hard link in /data/local/tmp. Resolve by guarding hard-link
+// subtests behind a Lit/helper feature check (similar to can-create-symlinks).
+// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
 
diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp
index 5d931891dd0eb6..ce4aa02db8bb0a 100644
--- a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp
@@ -14,8 +14,9 @@
 // XFAIL: using-built-library-before-llvm-13
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a hard link.
-// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api={{21|22|23}}
+// creating a hard link in /data/local/tmp. Resolve by guarding hard-link
+// subtests behind a Lit/helper feature check (similar to can-create-symlinks).
+// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
 
diff --git a/libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp b/libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp
index 1f2293989b7ef2..c6fa5b520bd9b7 100644
--- a/libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.rec.dir.itr/rec.dir.itr.members/increment.pass.cpp
@@ -10,9 +10,6 @@
 // UNSUPPORTED: c++03, c++11, c++14
 // UNSUPPORTED: no-filesystem
 
-// On Android L, ~scoped_test_env() is unable to delete the temp dir using
-// chmod+rm because chmod is too broken.
-// XFAIL: LIBCXX-ANDROID-FIXME && android-device-api={{21|22}}
 
 // <filesystem>
 
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy/copy.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy/copy.pass.cpp
index 1c5c1f4a3c49a8..52c4feddc8e2f3 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy/copy.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy/copy.pass.cpp
@@ -11,8 +11,9 @@
 // UNSUPPORTED: no-filesystem
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a FIFO file.
-// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api={{21|22|23}}
+// creating a FIFO file in /data/local/tmp. Resolve by guarding FIFO subtests
+// behind a Lit/helper feature check (similar to can-create-symlinks).
+// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
 
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp
index d33d9785176c96..605407bdd1c68e 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp
@@ -14,8 +14,9 @@
 // XFAIL: using-built-library-before-llvm-13
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a FIFO file.
-// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api={{21|22|23}}
+// creating a FIFO file in /data/local/tmp. Resolve by guarding FIFO subtests
+// behind a Lit/helper feature check (similar to can-create-symlinks).
+// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
 
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp
index d68267ca5a4d19..a53d074d12a5a3 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp
@@ -11,8 +11,9 @@
 // UNSUPPORTED: no-filesystem
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a hard link.
-// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api={{21|22|23}}
+// creating a hard link in /data/local/tmp. Resolve by guarding hard-link
+// subtests behind a Lit/helper feature check (similar to can-create-symlinks).
+// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
 
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp
index 5de9b51ffdb3a5..6b90b2d7bf7d73 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp
@@ -11,8 +11,9 @@
 // UNSUPPORTED: no-filesystem
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a hard link.
-// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api={{21|22|23}}
+// creating a hard link in /data/local/tmp. Resolve by guarding hard-link
+// subtests behind a Lit/helper feature check (similar to can-create-symlinks).
+// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
 
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp
index 7107d3112d1834..ca9cdf45cd568c 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp
@@ -11,8 +11,9 @@
 // UNSUPPORTED: no-filesystem
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a hard link.
-// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api={{21|22|23}}
+// creating a hard link in /data/local/tmp. Resolve by guarding hard-link
+// subtests behind a Lit/helper feature check (similar to can-create-symlinks).
+// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
 
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp
index f3161f2e020d29..f620d2b4035e01 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp
@@ -11,8 +11,9 @@
 // UNSUPPORTED: no-filesystem
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a FIFO file.
-// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api={{21|22|23}}
+// creating a FIFO file in /data/local/tmp. Resolve by guarding FIFO subtests
+// behind a Lit/helper feature check (similar to can-create-symlinks).
+// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
 
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp
index d32d02c312f2d2..9ed816aeae9ce1 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp
@@ -10,10 +10,11 @@
 // UNSUPPORTED: c++03, c++11, c++14
 // UNSUPPORTED: no-filesystem
 
-// Android's fchmodat seems broken on various OS versions -- see D140183. This
-// test probably passes on new-enough phones (not the emulator).
+// Bionic's fchmodat(..., AT_SYMLINK_NOFOLLOW) emulates nofollow via O_PATH +
+// /proc/self/fd, which fails on symlinks on older/emulator kernels (see D140183).
+// Resolve once CI emulators run a kernel/Bionic supporting fchmodat2 (Linux 6.6+)
+// or adjust libc++'s Posix permissions(nofollow) handling on Android.
 // XFAIL: LIBCXX-ANDROID-FIXME && target={{i686|x86_64}}-{{.+}}-android{{.*}}
-// XFAIL: LIBCXX-ANDROID-FIXME && android-device-api={{21|22}}
 
 // <filesystem>
 
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp
index 425c2246060386..930ce315a96ace 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp
@@ -11,8 +11,9 @@
 // UNSUPPORTED: no-filesystem
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a FIFO file.
-// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api={{21|22|23}}
+// creating a FIFO file in /data/local/tmp. Resolve by guarding FIFO subtests
+// behind a Lit/helper feature check (similar to can-create-symlinks).
+// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
 
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp
index 1d405a816e110b..de16d2fc63d0a3 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp
@@ -11,8 +11,9 @@
 // UNSUPPORTED: no-filesystem
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a FIFO file.
-// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api={{21|22|23}}
+// creating a FIFO file in /data/local/tmp. Resolve by guarding FIFO subtests
+// behind a Lit/helper feature check (similar to can-create-symlinks).
+// XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
 
diff --git a/libcxx/test/std/input.output/iostream.format/ext.manip/get_money.pass.cpp b/libcxx/test/std/input.output/iostream.format/ext.manip/get_money.pass.cpp
index 88672851f7b6b2..c748cf0577a5ca 100644
--- a/libcxx/test/std/input.output/iostream.format/ext.manip/get_money.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/ext.manip/get_money.pass.cpp
@@ -10,7 +10,10 @@
 
 // template <class moneyT> T7 get_money(moneyT& mon, bool intl = false);
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp b/libcxx/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp
index d0ff2c87689d14..ed9928303e69ad 100644
--- a/libcxx/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp
@@ -10,7 +10,10 @@
 
 // template <class charT, class moneyT> T8 put_money(const moneyT& mon, bool intl = false);
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.print/locale-specific_form.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.print/locale-specific_form.pass.cpp
index ba47aa294e5211..2465b70973ca1c 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.print/locale-specific_form.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.print/locale-specific_form.pass.cpp
@@ -15,7 +15,10 @@
 
 // XFAIL: availability-fp_to_chars-missing
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/input.output/iostream.format/print.fun/no_file_description.pass.cpp b/libcxx/test/std/input.output/iostream.format/print.fun/no_file_description.pass.cpp
index 283a8fddb8e8f3..c2de5b10efbaf8 100644
--- a/libcxx/test/std/input.output/iostream.format/print.fun/no_file_description.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/print.fun/no_file_description.pass.cpp
@@ -14,8 +14,6 @@
 // XFAIL: target={{.+}}-windows-gnu
 // XFAIL: availability-fp_to_chars-missing
 
-// fmemopen is available starting in Android M (API 23)
-// XFAIL: target={{.+}}-android{{(eabi)?(21|22)}}
 
 // <print>
 
diff --git a/libcxx/test/std/input.output/iostream.format/print.fun/print.file.pass.cpp b/libcxx/test/std/input.output/iostream.format/print.fun/print.file.pass.cpp
index 0bd5ca5eb2b9b0..7db19171acb684 100644
--- a/libcxx/test/std/input.output/iostream.format/print.fun/print.file.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/print.fun/print.file.pass.cpp
@@ -12,7 +12,10 @@
 
 // XFAIL: availability-fp_to_chars-missing
 
-// The error exception has no system error string.
+// Writing to a read-only FILE* in Bionic fails without setting the stream error
+// flag, and __handle_output_error in <print> passes std::ferror(stream) (0) instead
+// of errno to __throw_system_error, omitting the error message. Resolve by fixing
+// __handle_output_error to use errno rather than ferror()'s boolean return.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <print>
diff --git a/libcxx/test/std/input.output/iostream.format/print.fun/println.file.pass.cpp b/libcxx/test/std/input.output/iostream.format/print.fun/println.file.pass.cpp
index fc40680d6fba5e..effdf96238e8fb 100644
--- a/libcxx/test/std/input.output/iostream.format/print.fun/println.file.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/print.fun/println.file.pass.cpp
@@ -12,7 +12,10 @@
 
 // XFAIL: availability-fp_to_chars-missing
 
-// The error exception has no system error string.
+// Writing to a read-only FILE* in Bionic fails without setting the stream error
+// flag, and __handle_output_error in <print> passes std::ferror(stream) (0) instead
+// of errno to __throw_system_error, omitting the error message. Resolve by fixing
+// __handle_output_error to use errno rather than ferror()'s boolean return.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <print>
diff --git a/libcxx/test/std/input.output/iostream.format/print.fun/vprint_nonunicode.file.pass.cpp b/libcxx/test/std/input.output/iostream.format/print.fun/vprint_nonunicode.file.pass.cpp
index 66fe733ee10357..8593d01a3b656e 100644
--- a/libcxx/test/std/input.output/iostream.format/print.fun/vprint_nonunicode.file.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/print.fun/vprint_nonunicode.file.pass.cpp
@@ -17,7 +17,10 @@
 
 // XFAIL: availability-fp_to_chars-missing
 
-// The error exception has no system error string.
+// Writing to a read-only FILE* in Bionic fails without setting the stream error
+// flag, and __handle_output_error in <print> passes std::ferror(stream) (0) instead
+// of errno to __throw_system_error, omitting the error message. Resolve by fixing
+// __handle_output_error to use errno rather than ferror()'s boolean return.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <print>
diff --git a/libcxx/test/std/input.output/iostream.format/print.fun/vprint_unicode.file.pass.cpp b/libcxx/test/std/input.output/iostream.format/print.fun/vprint_unicode.file.pass.cpp
index fe49876d0b0496..fb73db7144bbe4 100644
--- a/libcxx/test/std/input.output/iostream.format/print.fun/vprint_unicode.file.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/print.fun/vprint_unicode.file.pass.cpp
@@ -18,7 +18,10 @@
 
 // XFAIL: availability-fp_to_chars-missing
 
-// The error exception has no system error string.
+// Writing to a read-only FILE* in Bionic fails without setting the stream error
+// flag, and __handle_output_error in <print> passes std::ferror(stream) (0) instead
+// of errno to __throw_system_error, omitting the error message. Resolve by fixing
+// __handle_output_error to use errno rather than ferror()'s boolean return.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <print>
diff --git a/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.readmany.sh.cpp b/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.readmany.sh.cpp
index 26b5d5093fa86b..5e99ecc6d805f7 100644
--- a/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.readmany.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.readmany.sh.cpp
@@ -11,9 +11,11 @@
 // https://gitlab.com/qemu-project/qemu/-/issues/1963
 // UNSUPPORTED: LIBCXX-PICOLIBC-FIXME
 
-// This test hangs on Android devices that lack shell_v2, which was added in
-// Android N (API 24).
-// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api={{2[1-3]}}
+// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
+// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
+// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
+// remove once API 23 testing is dropped.
+// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // <iostream>
 
diff --git a/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sh.cpp b/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sh.cpp
index 4f23b6b9a5d877..61d1bbaf848c99 100644
--- a/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sh.cpp
@@ -11,9 +11,11 @@
 // https://gitlab.com/qemu-project/qemu/-/issues/1963
 // UNSUPPORTED: LIBCXX-PICOLIBC-FIXME
 
-// This test hangs on Android devices that lack shell_v2, which was added in
-// Android N (API 24).
-// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api={{2[1-3]}}
+// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
+// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
+// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
+// remove once API 23 testing is dropped.
+// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // <iostream>
 
diff --git a/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sync_with_stdio.sh.cpp b/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sync_with_stdio.sh.cpp
index 052356449c5abd..1a810b340716e0 100644
--- a/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sync_with_stdio.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sync_with_stdio.sh.cpp
@@ -11,9 +11,11 @@
 // https://gitlab.com/qemu-project/qemu/-/issues/1963
 // UNSUPPORTED: LIBCXX-PICOLIBC-FIXME
 
-// This test hangs on Android devices that lack shell_v2, which was added in
-// Android N (API 24).
-// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api={{2[1-3]}}
+// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
+// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
+// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
+// remove once API 23 testing is dropped.
+// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // <iostream>
 
diff --git a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin-imbue.sh.cpp b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin-imbue.sh.cpp
index 64172064bea70b..f28711ff146894 100644
--- a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin-imbue.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin-imbue.sh.cpp
@@ -6,9 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-// This test hangs on Android devices that lack shell_v2, which was added in
-// Android N (API 24).
-// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api={{2[1-3]}}
+// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
+// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
+// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
+// remove once API 23 testing is dropped.
+// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // <iostream>
 
diff --git a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.readmany.sh.cpp b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.readmany.sh.cpp
index 9f96414d02986a..6577ac712f653a 100644
--- a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.readmany.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.readmany.sh.cpp
@@ -11,9 +11,11 @@
 // https://gitlab.com/qemu-project/qemu/-/issues/1963
 // UNSUPPORTED: LIBCXX-PICOLIBC-FIXME
 
-// This test hangs on Android devices that lack shell_v2, which was added in
-// Android N (API 24).
-// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api={{2[1-3]}}
+// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
+// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
+// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
+// remove once API 23 testing is dropped.
+// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // UNSUPPORTED: no-wide-characters
 
diff --git a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sh.cpp b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sh.cpp
index 08b74b999bbf4f..4c547a90089d50 100644
--- a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sh.cpp
@@ -6,9 +6,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-// This test hangs on Android devices that lack shell_v2, which was added in
-// Android N (API 24).
-// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api={{2[1-3]}}
+// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
+// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
+// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
+// remove once API 23 testing is dropped.
+// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // <iostream>
 
diff --git a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sync_with_stdio.sh.cpp b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sync_with_stdio.sh.cpp
index db6c5ba0e8660b..f540176739ce37 100644
--- a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sync_with_stdio.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sync_with_stdio.sh.cpp
@@ -11,9 +11,11 @@
 // https://gitlab.com/qemu-project/qemu/-/issues/1963
 // UNSUPPORTED: LIBCXX-PICOLIBC-FIXME
 
-// This test hangs on Android devices that lack shell_v2, which was added in
-// Android N (API 24).
-// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api={{2[1-3]}}
+// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
+// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
+// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
+// remove once API 23 testing is dropped.
+// UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // UNSUPPORTED: no-wide-characters
 
diff --git a/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump2gig.pass.cpp b/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump2gig.pass.cpp
index 6c747964e33b80..ccca6d6b6015db 100644
--- a/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump2gig.pass.cpp
+++ b/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump2gig.pass.cpp
@@ -21,8 +21,10 @@
 // allocation failure when attempting to allocate the 2GiB string.
 // UNSUPPORTED: no-exceptions
 
-// Android devices frequently don't have enough memory to run this test. Rather
-// than throw std::bad_alloc, exhausting memory triggers the OOM Killer.
+// Android devices/emulators frequently lack enough RAM for a 2 GiB allocation, and
+// memory overcommit triggers the kernel OOM killer rather than throwing std::bad_alloc.
+// Resolve by setting RLIMIT_AS in adb_run.py (or the test) so mmap/malloc fails
+// with ENOMEM and throws std::bad_alloc before invoking the OOM killer.
 // UNSUPPORTED: LIBCXX-ANDROID-FIXME
 
 #include <sstream>
diff --git a/libcxx/test/std/input.output/string.streams/stringstream/stringstream.members/gcount.pass.cpp b/libcxx/test/std/input.output/string.streams/stringstream/stringstream.members/gcount.pass.cpp
index 84004dc12f11ac..02ba9e1189b50d 100644
--- a/libcxx/test/std/input.output/string.streams/stringstream/stringstream.members/gcount.pass.cpp
+++ b/libcxx/test/std/input.output/string.streams/stringstream/stringstream.members/gcount.pass.cpp
@@ -12,8 +12,10 @@
 // This bug was fixed in the dylib by 53aed4759b33e33614e0f4e321bc1ef764b6d5b6.
 // XFAIL: using-built-library-before-llvm-17
 
-// Android devices frequently don't have enough memory to run this test. Rather
-// than throw std::bad_alloc, exhausting memory triggers the OOM Killer.
+// Android devices/emulators frequently lack enough RAM for a 2 GiB allocation, and
+// memory overcommit triggers the kernel OOM killer rather than throwing std::bad_alloc.
+// Resolve by setting RLIMIT_AS in adb_run.py (or the test) so mmap/malloc fails
+// with ENOMEM and throws std::bad_alloc before invoking the OOM killer.
 // UNSUPPORTED: LIBCXX-ANDROID-FIXME
 
 // Test that tellp() does not break the stringstream after INT_MAX, due to use
diff --git a/libcxx/test/std/language.support/support.runtime/cstdlib.aligned_alloc.compile.pass.cpp b/libcxx/test/std/language.support/support.runtime/cstdlib.aligned_alloc.compile.pass.cpp
index 67eef7da413b7f..e3134f505e69cc 100644
--- a/libcxx/test/std/language.support/support.runtime/cstdlib.aligned_alloc.compile.pass.cpp
+++ b/libcxx/test/std/language.support/support.runtime/cstdlib.aligned_alloc.compile.pass.cpp
@@ -19,7 +19,7 @@
 // XFAIL: target={{.+}}-windows-{{.+}}
 
 // ::aligned_alloc is available starting with Android P (API 28)
-// XFAIL: target={{.+}}-android{{(eabi)?(21|22|23|24|25|26|27)}}
+// XFAIL: target={{.+}}-android{{(eabi)?(23|24|25|26|27)}}
 
 #include <cstdlib>
 #include <type_traits>
diff --git a/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp b/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp
index 9d3e6d892daf0d..a297a18fdf23c2 100644
--- a/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp
+++ b/libcxx/test/std/language.support/support.runtime/cstdlib.pass.cpp
@@ -9,9 +9,7 @@
 // test <cstdlib>
 
 // mblen was added in Android API 26.
-// TODO: Switch from UNSUPPORTED to XFAIL once the Android CI Docker sysroot is
-// updated.
-// UNSUPPORTED: LIBCXX-ANDROID-FIXME && target={{.+}}-android{{(eabi)?(21|22|23|24|25)}}
+// XFAIL: target={{.+}}-android{{(eabi)?(23|24|25)}}
 
 #include <cstdlib>
 #include <cassert>
diff --git a/libcxx/test/std/language.support/support.runtime/ctime.timespec.compile.pass.cpp b/libcxx/test/std/language.support/support.runtime/ctime.timespec.compile.pass.cpp
index 194262bb42e3b9..d942ba4c4cddc9 100644
--- a/libcxx/test/std/language.support/support.runtime/ctime.timespec.compile.pass.cpp
+++ b/libcxx/test/std/language.support/support.runtime/ctime.timespec.compile.pass.cpp
@@ -16,7 +16,7 @@
 // XFAIL: target={{.+}}-apple-macosx10.{{13|14}}
 
 // ::timespec_get is available starting with Android Q (API 29)
-// XFAIL: target={{.+}}-android{{(eabi)?(21|22|23|24|25|26|27|28)}}
+// XFAIL: target={{.+}}-android{{(eabi)?(23|24|25|26|27|28)}}
 
 // ::timespec_get is available starting with AIX 7.3 TL2
 // XFAIL: target={{.+}}-aix{{7.2.*|7.3.0.*|7.3.1.*}}
diff --git a/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp b/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp
index 79e76c201e441b..6ceb23a7ce3b1a 100644
--- a/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp
@@ -6,7 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp b/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp
index 4978db116ef390..37d31c97791bd2 100644
--- a/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp
@@ -9,7 +9,10 @@
 // NetBSD does not support LC_COLLATE at the moment
 // XFAIL: netbsd
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp
index 5cebc079c47039..68e1b62737a073 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp
@@ -15,7 +15,10 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: no-wide-characters
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 #include <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp
index 2869378b42b92c..c1a4bc3ba792f2 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp
@@ -15,7 +15,10 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: no-wide-characters
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 #include <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp
index 78bd0a1ef210e5..f62c0cd13d81f0 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp
@@ -15,7 +15,10 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: no-wide-characters
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 #include <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp
index 5f9788a0bfa5be..f8b2763862c656 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp
@@ -15,7 +15,10 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: no-wide-characters
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 #include <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
index 447353de8af72f..6924c71db7d216 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
@@ -9,7 +9,10 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: win32-broken-utf8-wchar-ctype
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
index 94ecc6c8fa85b0..c1ed7438d23854 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
@@ -9,7 +9,10 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: win32-broken-utf8-wchar-ctype
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
index 2b37737a26bc36..e1856804057eae 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
@@ -9,7 +9,10 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: win32-broken-utf8-wchar-ctype
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
index 016d8d736ad22a..509d7a6b4d21af 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
@@ -9,7 +9,10 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: win32-broken-utf8-wchar-ctype
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
index 9997b07134563b..7c4d9b8324384a 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
@@ -13,7 +13,10 @@
 // iter_type get(iter_type b, iter_type e, bool intl, ios_base& iob,
 //               ios_base::iostate& err, long double& v) const;
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
index 478df7964f6d2b..295a87c2895035 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
@@ -13,7 +13,10 @@
 // iter_type get(iter_type b, iter_type e, bool intl, ios_base& iob,
 //               ios_base::iostate& err, string_type& v) const;
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
index 4b767fae871fa7..884cd0c30a9fe1 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
@@ -13,7 +13,10 @@
 // iter_type put(iter_type s, bool intl, ios_base& f, char_type fill,
 //               long double units) const;
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
index 1c8710a008f27f..222f9463ec5bd8 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
@@ -13,7 +13,10 @@
 // iter_type put(iter_type s, bool intl, ios_base& f, char_type fill,
 //               const string_type& units) const;
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/re/re.traits/translate_nocase.pass.cpp b/libcxx/test/std/re/re.traits/translate_nocase.pass.cpp
index be81286e72cbd7..0db73ef1790c09 100644
--- a/libcxx/test/std/re/re.traits/translate_nocase.pass.cpp
+++ b/libcxx/test/std/re/re.traits/translate_nocase.pass.cpp
@@ -15,9 +15,11 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: win32-broken-utf8-wchar-ctype
 
-// Prior to Android O (API 26), in the "en_US.UTF-8" locale, towlower(L'\xDA')
-// returned 0xDA instead of 0xFA.
-// XFAIL: LIBCXX-ANDROID-FIXME && android-device-api={{21|22|23|24|25}}
+// Prior to Android O (API 26), Bionic's towlower(L'\xDA') in "en_US.UTF-8"
+// only case-folded ASCII and returned 0xDA instead of 0xFA. Remove once Android CI
+// drops pre-API-26 device testing (or drop LIBCXX-ANDROID-FIXME if kept as a
+// permanent OS bug XFAIL).
+// XFAIL: LIBCXX-ANDROID-FIXME && android-device-api={{23|24|25}}
 
 #include <regex>
 #include <cassert>
diff --git a/libcxx/test/std/strings/c.strings/cwctype.pass.cpp b/libcxx/test/std/strings/c.strings/cwctype.pass.cpp
index 3de582714d01de..1741b9984cdcd9 100644
--- a/libcxx/test/std/strings/c.strings/cwctype.pass.cpp
+++ b/libcxx/test/std/strings/c.strings/cwctype.pass.cpp
@@ -14,9 +14,7 @@
 // XFAIL: LLVM-LIBC-FIXME
 
 // towctrans and wctrans were added in Android API 26.
-// TODO: Switch from UNSUPPORTED to XFAIL once the Android CI Docker sysroot is
-// updated.
-// UNSUPPORTED: LIBCXX-ANDROID-FIXME && target={{.+}}-android{{(eabi)?(21|22|23|24|25)}}
+// XFAIL: target={{.+}}-android{{(eabi)?(23|24|25)}}
 
 #include <cwctype>
 #include <type_traits>
diff --git a/libcxx/test/std/thread/thread.condition/thread.condition.condvar/notify_one.pass.cpp b/libcxx/test/std/thread/thread.condition/thread.condition.condvar/notify_one.pass.cpp
index bc6c3016eb1a8e..a3dd54ae7f0f14 100644
--- a/libcxx/test/std/thread/thread.condition/thread.condition.condvar/notify_one.pass.cpp
+++ b/libcxx/test/std/thread/thread.condition/thread.condition.condvar/notify_one.pass.cpp
@@ -8,7 +8,10 @@
 //
 // UNSUPPORTED: no-threads
 
-// This test occasionally fails on Android.
+// This test assumes notify_one() wakes at most one waiter when both test1 and
+// test2 are non-zero, which occasionally fails under Android emulator scheduling
+// because POSIX allows pthread_cond_signal() to wake multiple threads. Resolve by
+// rewriting the test to tolerate spurious/multiple wakeups per POSIX.
 // UNSUPPORTED: LIBCXX-ANDROID-FIXME
 
 // <condition_variable>
diff --git a/libcxx/test/std/utilities/format/format.functions/locale-specific_form.pass.cpp b/libcxx/test/std/utilities/format/format.functions/locale-specific_form.pass.cpp
index e573f8d47dc99e..83c93f71545f3d 100644
--- a/libcxx/test/std/utilities/format/format.functions/locale-specific_form.pass.cpp
+++ b/libcxx/test/std/utilities/format/format.functions/locale-specific_form.pass.cpp
@@ -12,7 +12,10 @@
 
 // XFAIL: availability-fp_to_chars-missing
 
-// Bionic has minimal locale support, investigate this later.
+// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
+// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
+// localized named-locale data (or implementing ICU-backed locale facets on Android).
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/support/filesystem_test_helper.h b/libcxx/test/support/filesystem_test_helper.h
index 2ad9efb32c60f0..930cad2102f818 100644
--- a/libcxx/test/support/filesystem_test_helper.h
+++ b/libcxx/test/support/filesystem_test_helper.h
@@ -188,14 +188,12 @@ struct scoped_test_env
         // the assert, despite being able to delete everything with the following
         // `rm -r` command.
         //
-        // Android's chmod was buggy in old OSs, but skipping this assert is
-        // sufficient to ensure that the `rm -rf` succeeds for almost all tests:
-        //  - Android L: chmod aborts after one error
-        //  - Android L and M: chmod -R tries to set permissions of a symlink
-        //    target.
-        // LIBCXX-ANDROID-FIXME: Other fixes to consider: place a toybox chmod
-        // onto old devices, re-enable this assert for devices running Android N
-        // and up, rewrite this chmod+rm in C or C++.
+        // On Android M (API 23), `chmod -R` tries to set permissions on a
+        // dangling symlink target and returns non-zero, though skipping this
+        // assert allows the `rm -rf` below to succeed.
+        // LIBCXX-ANDROID-FIXME: Re-enable this assert on Android N (API 24) and
+        // up (via `android_get_device_api_level()`), or replace the shell
+        // `chmod` + `rm` cleanup with C/C++ directory removal.
         assert(ret == 0);
 #  endif
 
diff --git a/libcxx/utils/libcxx/test/features/platform.py b/libcxx/utils/libcxx/test/features/platform.py
index 5ce4b4a090e496..d008c491f430eb 100644
--- a/libcxx/utils/libcxx/test/features/platform.py
+++ b/libcxx/utils/libcxx/test/features/platform.py
@@ -78,6 +78,8 @@ def _getAndroidDeviceApi(cfg):
         name=lambda cfg: "android-device-api={}".format(_getAndroidDeviceApi(cfg)),
         when=lambda cfg: "__ANDROID__" in compilerMacros(cfg),
     ),
+    # Temporary carveout feature for Android test failures/exclusions that need
+    # follow-up investigation or fixes (as opposed to permanent `android` exclusions).
     Feature(
         name="LIBCXX-ANDROID-FIXME",
         when=lambda cfg: "__ANDROID__" in compilerMacros(cfg),

>From 0459a704b87f9c865acaba5b630ab64d9db42d5c Mon Sep 17 00:00:00 2001
From: Sharjeel Khan <sharjeelkhan at google.com>
Date: Tue, 17 Nov 2026 17:38:35 -0800
Subject: [PATCH 2/2] [libc++][Android] Trim LIBCXX-ANDROID-FIXME comments

---
 libcxx/test/configs/llvm-libc++-android.cfg.in       | 12 ++++++------
 .../extensions/clang/clang_modules_include.gen.py    |  5 +----
 .../iostream.objects/cin-read-stdio-sync.sh.cpp      |  6 ++----
 .../directory_entry.obs/file_size.pass.cpp           |  3 +--
 .../directory_entry.obs/file_type_obs.pass.cpp       |  3 +--
 .../directory_entry.obs/hard_link_count.pass.cpp     |  3 +--
 .../filesystems/fs.op.funcs/fs.op.copy/copy.pass.cpp |  3 +--
 .../fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp   |  3 +--
 .../fs.op.create_hard_link/create_hard_link.pass.cpp |  3 +--
 .../fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp |  3 +--
 .../fs.op.hard_lk_ct/hard_link_count.pass.cpp        |  3 +--
 .../fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp     |  3 +--
 .../fs.op.permissions/permissions.pass.cpp           |  6 ++----
 .../fs.op.funcs/fs.op.status/status.pass.cpp         |  3 +--
 .../fs.op.symlink_status/symlink_status.pass.cpp     |  3 +--
 .../iostream.format/ext.manip/get_money.pass.cpp     |  6 ++----
 .../iostream.format/ext.manip/put_money.pass.cpp     |  6 ++----
 .../locale-specific_form.pass.cpp                    |  6 ++----
 .../iostream.format/print.fun/print.file.pass.cpp    |  6 ++----
 .../iostream.format/print.fun/println.file.pass.cpp  |  6 ++----
 .../print.fun/vprint_nonunicode.file.pass.cpp        |  6 ++----
 .../print.fun/vprint_unicode.file.pass.cpp           |  6 ++----
 .../narrow.stream.objects/cin.readmany.sh.cpp        |  6 ++----
 .../narrow.stream.objects/cin.sh.cpp                 |  6 ++----
 .../narrow.stream.objects/cin.sync_with_stdio.sh.cpp |  6 ++----
 .../wide.stream.objects/wcin-imbue.sh.cpp            |  6 ++----
 .../wide.stream.objects/wcin.readmany.sh.cpp         |  6 ++----
 .../iostream.objects/wide.stream.objects/wcin.sh.cpp |  6 ++----
 .../wide.stream.objects/wcin.sync_with_stdio.sh.cpp  |  6 ++----
 .../streambuf.put.area/pbump2gig.pass.cpp            |  6 ++----
 .../stringstream.members/gcount.pass.cpp             |  6 ++----
 .../locale.collate.byname/compare.pass.cpp           |  6 ++----
 .../locale.collate.byname/transform.pass.cpp         |  6 ++----
 .../category.ctype/locale.ctype.byname/is_1.pass.cpp |  6 ++----
 .../locale.ctype.byname/is_many.pass.cpp             |  6 ++----
 .../locale.ctype.byname/scan_is.pass.cpp             |  6 ++----
 .../locale.ctype.byname/scan_not.pass.cpp            |  6 ++----
 .../locale.ctype.byname/tolower_1.pass.cpp           |  6 ++----
 .../locale.ctype.byname/tolower_many.pass.cpp        |  6 ++----
 .../locale.ctype.byname/toupper_1.pass.cpp           |  6 ++----
 .../locale.ctype.byname/toupper_many.pass.cpp        |  6 ++----
 .../get_long_double_en_US.pass.cpp                   |  6 ++----
 .../get_string_en_US.pass.cpp                        |  6 ++----
 .../put_long_double_en_US.pass.cpp                   |  6 ++----
 .../put_string_en_US.pass.cpp                        |  6 ++----
 .../test/std/re/re.traits/translate_nocase.pass.cpp  |  6 ++----
 .../thread.condition.condvar/notify_one.pass.cpp     |  6 ++----
 .../format.functions/locale-specific_form.pass.cpp   |  6 ++----
 libcxx/test/support/filesystem_test_helper.h         | 12 ++++++------
 libcxx/utils/libcxx/test/features/platform.py        |  2 --
 50 files changed, 94 insertions(+), 180 deletions(-)

diff --git a/libcxx/test/configs/llvm-libc++-android.cfg.in b/libcxx/test/configs/llvm-libc++-android.cfg.in
index dc693298b907d5..b550bb7a965570 100644
--- a/libcxx/test/configs/llvm-libc++-android.cfg.in
+++ b/libcxx/test/configs/llvm-libc++-android.cfg.in
@@ -15,12 +15,12 @@ config.substitutions.append(('%{flags}',
 
 compile_flags = '-nostdinc++ -I %{target-include-dir} -I %{include-dir} -I %{libcxx-dir}/test/support'
 if config.target_triple == 'i686-linux-android23':
-    # 32-bit x86 Android before Android N (API 24) has a bug where the stack is
-    # sometimes misaligned in __attribute__((constructor)) functions. Compile
-    # with -mstackrealign to work around the bug.
-    # LIBCXX-ANDROID-FIXME: Have the Clang driver pass -mstackrealign
-    # automatically for i686-linux-android23 (or remove once API 23 testing is
-    # dropped); see https://github.com/android/ndk/issues/693.
+    # 32-bit x86 Android has a bug where the stack is sometimes misaligned.
+    # The problem appears limited to versions before Android N (API 24) and only
+    # __attribute__((constructor)) functions. Compile with -mstackrealign to
+    # work around the bug.
+    # TODO: Consider automatically doing something like this in Clang itself (LIBCXX-ANDROID-FIXME)
+    # See https://github.com/android/ndk/issues/693.
     compile_flags += ' -mstackrealign'
 config.substitutions.append(('%{compile_flags}', compile_flags))
 
diff --git a/libcxx/test/extensions/clang/clang_modules_include.gen.py b/libcxx/test/extensions/clang/clang_modules_include.gen.py
index 7ee199dbe49b0e..ed058cd9085117 100644
--- a/libcxx/test/extensions/clang/clang_modules_include.gen.py
+++ b/libcxx/test/extensions/clang/clang_modules_include.gen.py
@@ -21,10 +21,7 @@
 # UNSUPPORTED: windows
 # UNSUPPORTED: buildhost=windows
 
-# Building the `std` Clang module against the Android NDK sysroot fails with
-# unresolved `using_if_exists` declarations (e.g. `::time_t` in `<ctime>`) because
-# the Bionic headers are not modularized yet. Re-enable once the NDK sysroot ships
-# a `module.modulemap` or libc++'s modulemap accommodates non-modular Bionic headers.
+# The Android headers don't appear to be compatible with modules yet
 # UNSUPPORTED: LIBCXX-ANDROID-FIXME
 
 # TODO: Investigate this failure
diff --git a/libcxx/test/libcxx/input.output/iostream.objects/cin-read-stdio-sync.sh.cpp b/libcxx/test/libcxx/input.output/iostream.objects/cin-read-stdio-sync.sh.cpp
index 803611decc1d36..c2f945bb4e61fc 100644
--- a/libcxx/test/libcxx/input.output/iostream.objects/cin-read-stdio-sync.sh.cpp
+++ b/libcxx/test/libcxx/input.output/iostream.objects/cin-read-stdio-sync.sh.cpp
@@ -11,10 +11,8 @@
 // https://gitlab.com/qemu-project/qemu/-/issues/1963
 // UNSUPPORTED: LIBCXX-PICOLIBC-FIXME
 
-// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
-// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
-// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
-// remove once API 23 testing is dropped.
+// This test hangs on Android devices that lack shell_v2, which was added in
+// Android N (API 24).
 // UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // <iostream>
diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp
index 1b1cf129c0b9d0..461c329fe3944d 100644
--- a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp
@@ -14,8 +14,7 @@
 // XFAIL: using-built-library-before-llvm-13
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a FIFO file in /data/local/tmp. Resolve by guarding FIFO subtests
-// behind a Lit/helper feature check (similar to can-create-symlinks).
+// creating a FIFO file.
 // XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_type_obs.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_type_obs.pass.cpp
index 3c54b407f3497c..af4182776ada2d 100644
--- a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_type_obs.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_type_obs.pass.cpp
@@ -10,8 +10,7 @@
 // UNSUPPORTED: c++03, c++11, c++14
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a hard link in /data/local/tmp. Resolve by guarding hard-link
-// subtests behind a Lit/helper feature check (similar to can-create-symlinks).
+// creating a hard link.
 // XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp
index ce4aa02db8bb0a..a800f09b0cd5b3 100644
--- a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp
@@ -14,8 +14,7 @@
 // XFAIL: using-built-library-before-llvm-13
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a hard link in /data/local/tmp. Resolve by guarding hard-link
-// subtests behind a Lit/helper feature check (similar to can-create-symlinks).
+// creating a hard link.
 // XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy/copy.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy/copy.pass.cpp
index 52c4feddc8e2f3..674e8d830cc379 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy/copy.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy/copy.pass.cpp
@@ -11,8 +11,7 @@
 // UNSUPPORTED: no-filesystem
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a FIFO file in /data/local/tmp. Resolve by guarding FIFO subtests
-// behind a Lit/helper feature check (similar to can-create-symlinks).
+// creating a FIFO file.
 // XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp
index 605407bdd1c68e..1acc1504623dc7 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp
@@ -14,8 +14,7 @@
 // XFAIL: using-built-library-before-llvm-13
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a FIFO file in /data/local/tmp. Resolve by guarding FIFO subtests
-// behind a Lit/helper feature check (similar to can-create-symlinks).
+// creating a FIFO file.
 // XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp
index a53d074d12a5a3..967022f1771d2a 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_hard_link/create_hard_link.pass.cpp
@@ -11,8 +11,7 @@
 // UNSUPPORTED: no-filesystem
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a hard link in /data/local/tmp. Resolve by guarding hard-link
-// subtests behind a Lit/helper feature check (similar to can-create-symlinks).
+// creating a hard link.
 // XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp
index 6b90b2d7bf7d73..ee39d834576f7e 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.equivalent/equivalent.pass.cpp
@@ -11,8 +11,7 @@
 // UNSUPPORTED: no-filesystem
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a hard link in /data/local/tmp. Resolve by guarding hard-link
-// subtests behind a Lit/helper feature check (similar to can-create-symlinks).
+// creating a hard link.
 // XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp
index ca9cdf45cd568c..7771be6f22a7e7 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.hard_lk_ct/hard_link_count.pass.cpp
@@ -11,8 +11,7 @@
 // UNSUPPORTED: no-filesystem
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a hard link in /data/local/tmp. Resolve by guarding hard-link
-// subtests behind a Lit/helper feature check (similar to can-create-symlinks).
+// creating a hard link.
 // XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp
index f620d2b4035e01..9ebd6c37b847d0 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.is_empty/is_empty.pass.cpp
@@ -11,8 +11,7 @@
 // UNSUPPORTED: no-filesystem
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a FIFO file in /data/local/tmp. Resolve by guarding FIFO subtests
-// behind a Lit/helper feature check (similar to can-create-symlinks).
+// creating a FIFO file.
 // XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp
index 9ed816aeae9ce1..a7c6e268afcae4 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.permissions/permissions.pass.cpp
@@ -10,10 +10,8 @@
 // UNSUPPORTED: c++03, c++11, c++14
 // UNSUPPORTED: no-filesystem
 
-// Bionic's fchmodat(..., AT_SYMLINK_NOFOLLOW) emulates nofollow via O_PATH +
-// /proc/self/fd, which fails on symlinks on older/emulator kernels (see D140183).
-// Resolve once CI emulators run a kernel/Bionic supporting fchmodat2 (Linux 6.6+)
-// or adjust libc++'s Posix permissions(nofollow) handling on Android.
+// Android's fchmodat seems broken on various OS versions -- see D140183. This
+// test probably passes on new-enough phones (not the emulator).
 // XFAIL: LIBCXX-ANDROID-FIXME && target={{i686|x86_64}}-{{.+}}-android{{.*}}
 
 // <filesystem>
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp
index 930ce315a96ace..9bf55485746310 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.status/status.pass.cpp
@@ -11,8 +11,7 @@
 // UNSUPPORTED: no-filesystem
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a FIFO file in /data/local/tmp. Resolve by guarding FIFO subtests
-// behind a Lit/helper feature check (similar to can-create-symlinks).
+// creating a FIFO file.
 // XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp
index de16d2fc63d0a3..f4f2210b15b7bf 100644
--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.symlink_status/symlink_status.pass.cpp
@@ -11,8 +11,7 @@
 // UNSUPPORTED: no-filesystem
 
 // Starting in Android N (API 24), SELinux policy prevents the shell user from
-// creating a FIFO file in /data/local/tmp. Resolve by guarding FIFO subtests
-// behind a Lit/helper feature check (similar to can-create-symlinks).
+// creating a FIFO file.
 // XFAIL: LIBCXX-ANDROID-FIXME && !android-device-api=23
 
 // <filesystem>
diff --git a/libcxx/test/std/input.output/iostream.format/ext.manip/get_money.pass.cpp b/libcxx/test/std/input.output/iostream.format/ext.manip/get_money.pass.cpp
index c748cf0577a5ca..9ec7280d147feb 100644
--- a/libcxx/test/std/input.output/iostream.format/ext.manip/get_money.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/ext.manip/get_money.pass.cpp
@@ -10,10 +10,8 @@
 
 // template <class moneyT> T7 get_money(moneyT& mon, bool intl = false);
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp b/libcxx/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp
index ed9928303e69ad..557d552896a46a 100644
--- a/libcxx/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/ext.manip/put_money.pass.cpp
@@ -10,10 +10,8 @@
 
 // template <class charT, class moneyT> T8 put_money(const moneyT& mon, bool intl = false);
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.print/locale-specific_form.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.print/locale-specific_form.pass.cpp
index 2465b70973ca1c..5b7cd6f3d04bb6 100644
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.print/locale-specific_form.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.formatted.print/locale-specific_form.pass.cpp
@@ -15,10 +15,8 @@
 
 // XFAIL: availability-fp_to_chars-missing
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/input.output/iostream.format/print.fun/print.file.pass.cpp b/libcxx/test/std/input.output/iostream.format/print.fun/print.file.pass.cpp
index 7db19171acb684..be81e013f66657 100644
--- a/libcxx/test/std/input.output/iostream.format/print.fun/print.file.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/print.fun/print.file.pass.cpp
@@ -12,10 +12,8 @@
 
 // XFAIL: availability-fp_to_chars-missing
 
-// Writing to a read-only FILE* in Bionic fails without setting the stream error
-// flag, and __handle_output_error in <print> passes std::ferror(stream) (0) instead
-// of errno to __throw_system_error, omitting the error message. Resolve by fixing
-// __handle_output_error to use errno rather than ferror()'s boolean return.
+// Bionic leaves ferror() as 0 on a read-only FILE* write, and <print> passes
+// ferror() instead of errno to __throw_system_error.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <print>
diff --git a/libcxx/test/std/input.output/iostream.format/print.fun/println.file.pass.cpp b/libcxx/test/std/input.output/iostream.format/print.fun/println.file.pass.cpp
index effdf96238e8fb..b7c7caa0b6f47a 100644
--- a/libcxx/test/std/input.output/iostream.format/print.fun/println.file.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/print.fun/println.file.pass.cpp
@@ -12,10 +12,8 @@
 
 // XFAIL: availability-fp_to_chars-missing
 
-// Writing to a read-only FILE* in Bionic fails without setting the stream error
-// flag, and __handle_output_error in <print> passes std::ferror(stream) (0) instead
-// of errno to __throw_system_error, omitting the error message. Resolve by fixing
-// __handle_output_error to use errno rather than ferror()'s boolean return.
+// Bionic leaves ferror() as 0 on a read-only FILE* write, and <print> passes
+// ferror() instead of errno to __throw_system_error.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <print>
diff --git a/libcxx/test/std/input.output/iostream.format/print.fun/vprint_nonunicode.file.pass.cpp b/libcxx/test/std/input.output/iostream.format/print.fun/vprint_nonunicode.file.pass.cpp
index 8593d01a3b656e..fee6483262ab3d 100644
--- a/libcxx/test/std/input.output/iostream.format/print.fun/vprint_nonunicode.file.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/print.fun/vprint_nonunicode.file.pass.cpp
@@ -17,10 +17,8 @@
 
 // XFAIL: availability-fp_to_chars-missing
 
-// Writing to a read-only FILE* in Bionic fails without setting the stream error
-// flag, and __handle_output_error in <print> passes std::ferror(stream) (0) instead
-// of errno to __throw_system_error, omitting the error message. Resolve by fixing
-// __handle_output_error to use errno rather than ferror()'s boolean return.
+// Bionic leaves ferror() as 0 on a read-only FILE* write, and <print> passes
+// ferror() instead of errno to __throw_system_error.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <print>
diff --git a/libcxx/test/std/input.output/iostream.format/print.fun/vprint_unicode.file.pass.cpp b/libcxx/test/std/input.output/iostream.format/print.fun/vprint_unicode.file.pass.cpp
index fb73db7144bbe4..e2561b43bada5e 100644
--- a/libcxx/test/std/input.output/iostream.format/print.fun/vprint_unicode.file.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/print.fun/vprint_unicode.file.pass.cpp
@@ -18,10 +18,8 @@
 
 // XFAIL: availability-fp_to_chars-missing
 
-// Writing to a read-only FILE* in Bionic fails without setting the stream error
-// flag, and __handle_output_error in <print> passes std::ferror(stream) (0) instead
-// of errno to __throw_system_error, omitting the error message. Resolve by fixing
-// __handle_output_error to use errno rather than ferror()'s boolean return.
+// Bionic leaves ferror() as 0 on a read-only FILE* write, and <print> passes
+// ferror() instead of errno to __throw_system_error.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <print>
diff --git a/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.readmany.sh.cpp b/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.readmany.sh.cpp
index 5e99ecc6d805f7..716ccb5e5fc6cf 100644
--- a/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.readmany.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.readmany.sh.cpp
@@ -11,10 +11,8 @@
 // https://gitlab.com/qemu-project/qemu/-/issues/1963
 // UNSUPPORTED: LIBCXX-PICOLIBC-FIXME
 
-// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
-// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
-// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
-// remove once API 23 testing is dropped.
+// This test hangs on Android devices that lack shell_v2, which was added in
+// Android N (API 24).
 // UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // <iostream>
diff --git a/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sh.cpp b/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sh.cpp
index 61d1bbaf848c99..02283700199ea3 100644
--- a/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sh.cpp
@@ -11,10 +11,8 @@
 // https://gitlab.com/qemu-project/qemu/-/issues/1963
 // UNSUPPORTED: LIBCXX-PICOLIBC-FIXME
 
-// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
-// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
-// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
-// remove once API 23 testing is dropped.
+// This test hangs on Android devices that lack shell_v2, which was added in
+// Android N (API 24).
 // UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // <iostream>
diff --git a/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sync_with_stdio.sh.cpp b/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sync_with_stdio.sh.cpp
index 1a810b340716e0..4e52b7ac32763f 100644
--- a/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sync_with_stdio.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/narrow.stream.objects/cin.sync_with_stdio.sh.cpp
@@ -11,10 +11,8 @@
 // https://gitlab.com/qemu-project/qemu/-/issues/1963
 // UNSUPPORTED: LIBCXX-PICOLIBC-FIXME
 
-// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
-// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
-// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
-// remove once API 23 testing is dropped.
+// This test hangs on Android devices that lack shell_v2, which was added in
+// Android N (API 24).
 // UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // <iostream>
diff --git a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin-imbue.sh.cpp b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin-imbue.sh.cpp
index f28711ff146894..9af3bbb945e6df 100644
--- a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin-imbue.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin-imbue.sh.cpp
@@ -6,10 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
-// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
-// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
-// remove once API 23 testing is dropped.
+// This test hangs on Android devices that lack shell_v2, which was added in
+// Android N (API 24).
 // UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // <iostream>
diff --git a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.readmany.sh.cpp b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.readmany.sh.cpp
index 6577ac712f653a..99e899bcb0422b 100644
--- a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.readmany.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.readmany.sh.cpp
@@ -11,10 +11,8 @@
 // https://gitlab.com/qemu-project/qemu/-/issues/1963
 // UNSUPPORTED: LIBCXX-PICOLIBC-FIXME
 
-// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
-// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
-// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
-// remove once API 23 testing is dropped.
+// This test hangs on Android devices that lack shell_v2, which was added in
+// Android N (API 24).
 // UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // UNSUPPORTED: no-wide-characters
diff --git a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sh.cpp b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sh.cpp
index 4c547a90089d50..613c5e679b2f63 100644
--- a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sh.cpp
@@ -6,10 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
-// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
-// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
-// remove once API 23 testing is dropped.
+// This test hangs on Android devices that lack shell_v2, which was added in
+// Android N (API 24).
 // UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // <iostream>
diff --git a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sync_with_stdio.sh.cpp b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sync_with_stdio.sh.cpp
index f540176739ce37..47e74f6ff1efd3 100644
--- a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sync_with_stdio.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcin.sync_with_stdio.sh.cpp
@@ -11,10 +11,8 @@
 // https://gitlab.com/qemu-project/qemu/-/issues/1963
 // UNSUPPORTED: LIBCXX-PICOLIBC-FIXME
 
-// This test pipes stdin via adb_run.py and hangs on Android M (API 23) because
-// adbd before Android N (API 24) lacks shell_v2 stdin EOF propagation. Resolve
-// by redirecting stdin from a pushed file in adb_run.py on pre-N devices, or
-// remove once API 23 testing is dropped.
+// This test hangs on Android devices that lack shell_v2, which was added in
+// Android N (API 24).
 // UNSUPPORTED: LIBCXX-ANDROID-FIXME && android-device-api=23
 
 // UNSUPPORTED: no-wide-characters
diff --git a/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump2gig.pass.cpp b/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump2gig.pass.cpp
index ccca6d6b6015db..6c747964e33b80 100644
--- a/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump2gig.pass.cpp
+++ b/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.protected/streambuf.put.area/pbump2gig.pass.cpp
@@ -21,10 +21,8 @@
 // allocation failure when attempting to allocate the 2GiB string.
 // UNSUPPORTED: no-exceptions
 
-// Android devices/emulators frequently lack enough RAM for a 2 GiB allocation, and
-// memory overcommit triggers the kernel OOM killer rather than throwing std::bad_alloc.
-// Resolve by setting RLIMIT_AS in adb_run.py (or the test) so mmap/malloc fails
-// with ENOMEM and throws std::bad_alloc before invoking the OOM killer.
+// Android devices frequently don't have enough memory to run this test. Rather
+// than throw std::bad_alloc, exhausting memory triggers the OOM Killer.
 // UNSUPPORTED: LIBCXX-ANDROID-FIXME
 
 #include <sstream>
diff --git a/libcxx/test/std/input.output/string.streams/stringstream/stringstream.members/gcount.pass.cpp b/libcxx/test/std/input.output/string.streams/stringstream/stringstream.members/gcount.pass.cpp
index 02ba9e1189b50d..84004dc12f11ac 100644
--- a/libcxx/test/std/input.output/string.streams/stringstream/stringstream.members/gcount.pass.cpp
+++ b/libcxx/test/std/input.output/string.streams/stringstream/stringstream.members/gcount.pass.cpp
@@ -12,10 +12,8 @@
 // This bug was fixed in the dylib by 53aed4759b33e33614e0f4e321bc1ef764b6d5b6.
 // XFAIL: using-built-library-before-llvm-17
 
-// Android devices/emulators frequently lack enough RAM for a 2 GiB allocation, and
-// memory overcommit triggers the kernel OOM killer rather than throwing std::bad_alloc.
-// Resolve by setting RLIMIT_AS in adb_run.py (or the test) so mmap/malloc fails
-// with ENOMEM and throws std::bad_alloc before invoking the OOM killer.
+// Android devices frequently don't have enough memory to run this test. Rather
+// than throw std::bad_alloc, exhausting memory triggers the OOM Killer.
 // UNSUPPORTED: LIBCXX-ANDROID-FIXME
 
 // Test that tellp() does not break the stringstream after INT_MAX, due to use
diff --git a/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp b/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp
index 6ceb23a7ce3b1a..ff7d34fda4e8d6 100644
--- a/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp
@@ -6,10 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp b/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp
index 37d31c97791bd2..0b22bc8b5d8184 100644
--- a/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/transform.pass.cpp
@@ -9,10 +9,8 @@
 // NetBSD does not support LC_COLLATE at the moment
 // XFAIL: netbsd
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp
index 68e1b62737a073..0002568f87dc23 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_1.pass.cpp
@@ -15,10 +15,8 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: no-wide-characters
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 #include <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp
index c1a4bc3ba792f2..e5009ca7b569e7 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/is_many.pass.cpp
@@ -15,10 +15,8 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: no-wide-characters
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 #include <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp
index f62c0cd13d81f0..60cfc55cb66220 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_is.pass.cpp
@@ -15,10 +15,8 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: no-wide-characters
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 #include <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp
index f8b2763862c656..61d8b08ba7d639 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/scan_not.pass.cpp
@@ -15,10 +15,8 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: no-wide-characters
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 #include <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
index 6924c71db7d216..2e8409ea7e5ca9 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_1.pass.cpp
@@ -9,10 +9,8 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: win32-broken-utf8-wchar-ctype
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
index c1ed7438d23854..34178731c76f4c 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/tolower_many.pass.cpp
@@ -9,10 +9,8 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: win32-broken-utf8-wchar-ctype
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
index e1856804057eae..c9a7a60cf84a5b 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_1.pass.cpp
@@ -9,10 +9,8 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: win32-broken-utf8-wchar-ctype
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
index 509d7a6b4d21af..7ad2519ccc2a0b 100644
--- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.ctype.byname/toupper_many.pass.cpp
@@ -9,10 +9,8 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: win32-broken-utf8-wchar-ctype
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // <locale>
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
index 7c4d9b8324384a..e5dfcdbd90a634 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_en_US.pass.cpp
@@ -13,10 +13,8 @@
 // iter_type get(iter_type b, iter_type e, bool intl, ios_base& iob,
 //               ios_base::iostate& err, long double& v) const;
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
index 295a87c2895035..1af7bd24192f5d 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_string_en_US.pass.cpp
@@ -13,10 +13,8 @@
 // iter_type get(iter_type b, iter_type e, bool intl, ios_base& iob,
 //               ios_base::iostate& err, string_type& v) const;
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
index 884cd0c30a9fe1..ffe2907d52b186 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_en_US.pass.cpp
@@ -13,10 +13,8 @@
 // iter_type put(iter_type s, bool intl, ios_base& f, char_type fill,
 //               long double units) const;
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
index 222f9463ec5bd8..66720e16dff21b 100644
--- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_string_en_US.pass.cpp
@@ -13,10 +13,8 @@
 // iter_type put(iter_type s, bool intl, ios_base& f, char_type fill,
 //               const string_type& units) const;
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/std/re/re.traits/translate_nocase.pass.cpp b/libcxx/test/std/re/re.traits/translate_nocase.pass.cpp
index 0db73ef1790c09..92e96d3aa724a5 100644
--- a/libcxx/test/std/re/re.traits/translate_nocase.pass.cpp
+++ b/libcxx/test/std/re/re.traits/translate_nocase.pass.cpp
@@ -15,10 +15,8 @@
 // REQUIRES: locale.en_US.UTF-8
 // XFAIL: win32-broken-utf8-wchar-ctype
 
-// Prior to Android O (API 26), Bionic's towlower(L'\xDA') in "en_US.UTF-8"
-// only case-folded ASCII and returned 0xDA instead of 0xFA. Remove once Android CI
-// drops pre-API-26 device testing (or drop LIBCXX-ANDROID-FIXME if kept as a
-// permanent OS bug XFAIL).
+// Prior to Android O (API 26), in the "en_US.UTF-8" locale, towlower(L'\xDA')
+// returned 0xDA instead of 0xFA.
 // XFAIL: LIBCXX-ANDROID-FIXME && android-device-api={{23|24|25}}
 
 #include <regex>
diff --git a/libcxx/test/std/thread/thread.condition/thread.condition.condvar/notify_one.pass.cpp b/libcxx/test/std/thread/thread.condition/thread.condition.condvar/notify_one.pass.cpp
index a3dd54ae7f0f14..56188660108b58 100644
--- a/libcxx/test/std/thread/thread.condition/thread.condition.condvar/notify_one.pass.cpp
+++ b/libcxx/test/std/thread/thread.condition/thread.condition.condvar/notify_one.pass.cpp
@@ -8,10 +8,8 @@
 //
 // UNSUPPORTED: no-threads
 
-// This test assumes notify_one() wakes at most one waiter when both test1 and
-// test2 are non-zero, which occasionally fails under Android emulator scheduling
-// because POSIX allows pthread_cond_signal() to wake multiple threads. Resolve by
-// rewriting the test to tolerate spurious/multiple wakeups per POSIX.
+// Flakes on Android when pthread_cond_signal() wakes both waiters (allowed by
+// POSIX), which this test does not tolerate.
 // UNSUPPORTED: LIBCXX-ANDROID-FIXME
 
 // <condition_variable>
diff --git a/libcxx/test/std/utilities/format/format.functions/locale-specific_form.pass.cpp b/libcxx/test/std/utilities/format/format.functions/locale-specific_form.pass.cpp
index 83c93f71545f3d..263a90aff50e2f 100644
--- a/libcxx/test/std/utilities/format/format.functions/locale-specific_form.pass.cpp
+++ b/libcxx/test/std/utilities/format/format.functions/locale-specific_form.pass.cpp
@@ -12,10 +12,8 @@
 
 // XFAIL: availability-fp_to_chars-missing
 
-// Bionic maps named locales like "en_US.UTF-8" to "C.UTF-8" without localized
-// collation, monetary, or non-ASCII ctype tables, even though setlocale() succeeds.
-// Resolve by teaching Lit's locale detection in localization.py that Bionic lacks
-// localized named-locale data (or implementing ICU-backed locale facets on Android).
+// Bionic aliases named locales like "en_US.UTF-8" to "C.UTF-8" without localized
+// tables; teach localization.py to detect this or add ICU-backed facets.
 // XFAIL: LIBCXX-ANDROID-FIXME
 
 // REQUIRES: locale.en_US.UTF-8
diff --git a/libcxx/test/support/filesystem_test_helper.h b/libcxx/test/support/filesystem_test_helper.h
index 930cad2102f818..0ed80a96ff740e 100644
--- a/libcxx/test/support/filesystem_test_helper.h
+++ b/libcxx/test/support/filesystem_test_helper.h
@@ -188,12 +188,12 @@ struct scoped_test_env
         // the assert, despite being able to delete everything with the following
         // `rm -r` command.
         //
-        // On Android M (API 23), `chmod -R` tries to set permissions on a
-        // dangling symlink target and returns non-zero, though skipping this
-        // assert allows the `rm -rf` below to succeed.
-        // LIBCXX-ANDROID-FIXME: Re-enable this assert on Android N (API 24) and
-        // up (via `android_get_device_api_level()`), or replace the shell
-        // `chmod` + `rm` cleanup with C/C++ directory removal.
+        // Android's chmod was buggy in old OSs, but skipping this assert is
+        // sufficient to ensure that the `rm -rf` succeeds for almost all tests:
+        //  - Android M: chmod -R tries to set permissions of a symlink target.
+        // LIBCXX-ANDROID-FIXME: Other fixes to consider: place a toybox chmod
+        // onto old devices, re-enable this assert for devices running Android N
+        // and up, rewrite this chmod+rm in C or C++.
         assert(ret == 0);
 #  endif
 
diff --git a/libcxx/utils/libcxx/test/features/platform.py b/libcxx/utils/libcxx/test/features/platform.py
index d008c491f430eb..5ce4b4a090e496 100644
--- a/libcxx/utils/libcxx/test/features/platform.py
+++ b/libcxx/utils/libcxx/test/features/platform.py
@@ -78,8 +78,6 @@ def _getAndroidDeviceApi(cfg):
         name=lambda cfg: "android-device-api={}".format(_getAndroidDeviceApi(cfg)),
         when=lambda cfg: "__ANDROID__" in compilerMacros(cfg),
     ),
-    # Temporary carveout feature for Android test failures/exclusions that need
-    # follow-up investigation or fixes (as opposed to permanent `android` exclusions).
     Feature(
         name="LIBCXX-ANDROID-FIXME",
         when=lambda cfg: "__ANDROID__" in compilerMacros(cfg),



More information about the llvm-branch-commits mailing list