| commit | cc3cfc848e1abfc8fd1ae0ce4f2c6969545f98df | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Oct 06 00:14:57 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 00:14:57 2023 +0000 |
| tree | 28746f602759123edc975649fc0ab5a4c429ea53 | |
| parent | ed47136a672dec9e7d6fee8d1b4b9e1e4e4452a3 [diff] | |
| parent | 87627e984859ca55e459f7e3287626a44f54d237 [diff] |
Backport https://reviews.llvm.org/D69983. am: 847f383168 am: 87627e9848 Original change: https://android-review.googlesource.com/c/platform/external/libcxx/+/2776366 Change-Id: Id6f65e76c2ec9347a7a8753d9c6557b0142e2ef3 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