[libcxx-commits] [PATCH] D122593: Add android/ndk-version.h and android/api-level.h

[Zijun Zhao via Phabricator via libcxx-commits]

ZijunZhao updated this revision to Diff 419854.
ZijunZhao retitled this revision from "missing android/ndk-version.h" to "Add android/ndk-version.h and android/api-level.h".
ZijunZhao edited the summary of this revision.
ZijunZhao added a comment.

Add android/ndk-version.h and android/api-level.h


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D122593/new/

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
@@ -26,10 +26,15 @@
 #if defined(__ANDROID__)
 
 #include <android/api-level.h>
-#include <android/ndk-version.h>
 #if __ANDROID_API__ < 21
 #include <__support/xlocale/__posix_l_fallback.h>
 #endif
+
+// 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/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 +68,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.419854.patch
Type: text/x-patch
Size: 1062 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20220401/81db6cce/attachment.bin>