Backport https://reviews.llvm.org/D69983. am: 847f383168 am: 87627e9848 am: cc3cfc848e am: cbd12ac1ef am: 90f6213b7d
Original change: https://android-review.googlesource.com/c/platform/external/libcxx/+/2776366
Change-Id: I77efc88aaa9014c73ac32d8c93e88a588e810ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/include/support/android/locale_bionic.h b/include/support/android/locale_bionic.h
index ee209ec..1f9c9b0 100644
--- a/include/support/android/locale_bionic.h
+++ b/include/support/android/locale_bionic.h
@@ -26,14 +26,15 @@
#if defined(__ANDROID__)
+#include <android/api-level.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/api-level.h>
#include <android/ndk-version.h>
// In NDK versions later than 16, locale-aware functions are provided by
// legacy_stdlib_inlines.h