summaryrefslogtreecommitdiffstats
path: root/libcxx
diff options
context:
space:
mode:
authorShoaib Meenai <smeenai@fb.com>2019-11-07 19:55:58 -0800
committerShoaib Meenai <smeenai@fb.com>2019-11-25 11:06:08 -0800
commitd018b556c7556b8fb599d44b17a936369b940297 (patch)
tree5c1cf8fbeff61a1328b5c660e665ced9ce53a8bb /libcxx
parent6a7f6145d08b2647c75f75bd1c747a3316e03d03 (diff)
downloadbcm5719-llvm-d018b556c7556b8fb599d44b17a936369b940297.tar.gz
bcm5719-llvm-d018b556c7556b8fb599d44b17a936369b940297.zip
[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
Diffstat (limited to 'libcxx')
-rw-r--r--libcxx/include/support/android/locale_bionic.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libcxx/include/support/android/locale_bionic.h b/libcxx/include/support/android/locale_bionic.h
index 5b16071d9cd..f05a6a0522c 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
OpenPOWER on IntegriCloud