diff --git a/include/support/android/locale_bionic.h b/include/support/android/locale_bionic.h index d638757fd..dfeb696ed 100644 --- a/include/support/android/locale_bionic.h +++ b/include/support/android/locale_bionic.h @@ -26,9 +26,15 @@ extern "C" { #if defined(__ANDROID__) +#include + +// 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() + #include #include -#include // In NDK versions later than 16, locale-aware functions are provided by // legacy_stdlib_inlines.h #if __NDK_MAJOR__ <= 16 @@ -62,6 +68,7 @@ inline _LIBCPP_ALWAYS_INLINE long strtol_l(const char* __nptr, char** __endptr, #endif // __ANDROID_API__ < 26 #endif // __NDK_MAJOR__ <= 16 +#endif // __has_include() #endif // defined(__ANDROID__) #endif // defined(__BIONIC__)