[libcxx-commits] [PATCH] D122593: Fix CtsDeqpTestCases failures

[Zijun Zhao via Phabricator via libcxx-commits]

ZijunZhao created this revision.
ZijunZhao added reviewers: rprichard, danalbert, pirama.
Herald added a project: All.
ZijunZhao requested review of this revision.
Herald added a project: libc++.
Herald added a subscriber: libcxx-commits.
Herald added a reviewer: libc++.

https://buganizer.corp.google.com/issues/222341313


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D122593

Files:
  libcxx/include/__support/android/locale_bionic.h


Index: libcxx/include/__support/android/locale_bionic.h
===================================================================
--- libcxx/include/__support/android/locale_bionic.h
+++ libcxx/include/__support/android/locale_bionic.h
@@ -30,6 +30,19 @@
 #if __ANDROID_API__ < 21
 #include <__support/xlocale/__posix_l_fallback.h>
 #endif
+
+// HACK: Not in upstream NDK or libc++.
+// Upstream now supports using ToT libc++ with old NDKs, but as such it is now
+// *only* compatible with the NDK. That will need to be fixed both for the
+// platorm and for the NDK-in-platform use case since neither has
+// android/ndk-version.h.
+
+// If we do not have this header, we are in a platform build rather than an NDK
+// build, which will always be at least as new as the ToT NDK, in which case we
+// don't need any of the inlines below since libc provides them.
+#    if __has_include(<android/ndk-version.h>)
+#      include <android/api-level.h>
+#      include <android/ndk-version.h>
 // In NDK versions later than 16, locale-aware functions are provided by
 // legacy_stdlib_inlines.h
 #if __NDK_MAJOR__ <= 16
@@ -63,6 +76,7 @@
 #endif // __ANDROID_API__ < 26
 
 #endif // __NDK_MAJOR__ <= 16
+#    endif // __has_include(<android/ndk-version.h>)
 #endif // defined(__ANDROID__)
 
 #endif // defined(__BIONIC__)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D122593.418616.patch
Type: text/x-patch
Size: 1312 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20220328/06f7158e/attachment.bin>