[libcxx-commits] [libcxx] d018b55 - [libcxx] Omit unneeded locale fallbacks on Android 21+

[Shoaib Meenai via libcxx-commits]

Author: Shoaib Meenai
Date: 2019-11-25T11:06:08-08:00
New Revision: d018b556c7556b8fb599d44b17a936369b940297

URL: https://github.com/llvm/llvm-project/commit/d018b556c7556b8fb599d44b17a936369b940297
DIFF: https://github.com/llvm/llvm-project/commit/d018b556c7556b8fb599d44b17a936369b940297.diff

LOG: [libcxx] Omit unneeded locale fallbacks on Android 21+

Android API level 21 and above have all these functions available, so we
don't need to include our fallback definitions.

Differential Revision: https://reviews.llvm.org/D69983

Added: 
    

Modified: 
    libcxx/include/support/android/locale_bionic.h

Removed: 
    


################################################################################
diff  --git a/libcxx/include/support/android/locale_bionic.h b/libcxx/include/support/android/locale_bionic.h
index 5b16071d9cdb..f05a6a0522ca 100644
--- a/libcxx/include/support/android/locale_bionic.h
+++ b/libcxx/include/support/android/locale_bionic.h
@@ -27,7 +27,9 @@ extern "C" {
 
 #include <android/api-level.h>
 #include <android/ndk-version.h>
+#if __ANDROID_API__ < 21
 #include <support/xlocale/__posix_l_fallback.h>
+#endif
 // In NDK versions later than 16, locale-aware functions are provided by
 // legacy_stdlib_inlines.h
 #if __NDK_MAJOR__ <= 16