Snap for 10957012 from ebb6f001390464470f8cc78a40fc086e9e85ab9a to simpleperf-release
Change-Id: Icaba06f91329940d06c3a15f5c9fa1e2ea5c4b7b
diff --git a/Android.bp b/Android.bp
index c759964..5395099 100644
--- a/Android.bp
+++ b/Android.bp
@@ -191,10 +191,6 @@
enabled: true,
},
},
-
- header_abi_checker: {
- diff_flags: ["-allow-adding-removing-weak-symbols"],
- },
}
cc_library_static {
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
