Work around upstream patch for old NDKs.
The Chrome folks are trying to build libc++ with an old NDK and added
checks to handle that, but we don't have <android/ndk-version.h> in
the platform.
Test: make checkbuild
Bug: None
Change-Id: Ic28bd67ecee1a93b47ce0b307415c3ff25b449eb
diff --git a/include/support/android/locale_bionic.h b/include/support/android/locale_bionic.h
index d638757..dfeb696 100644
--- a/include/support/android/locale_bionic.h
+++ b/include/support/android/locale_bionic.h
@@ -26,9 +26,15 @@
#if defined(__ANDROID__)
+#include <support/xlocale/__posix_l_fallback.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>
-#include <support/xlocale/__posix_l_fallback.h>
// In NDK versions later than 16, locale-aware functions are provided by
// legacy_stdlib_inlines.h
#if __NDK_MAJOR__ <= 16
@@ -62,6 +68,7 @@
#endif // __ANDROID_API__ < 26
#endif // __NDK_MAJOR__ <= 16
+#endif // __has_include(<android/ndk-version.h>)
#endif // defined(__ANDROID__)
#endif // defined(__BIONIC__)
