diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-10 23:05:31 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-10 23:05:31 +0000 |
| commit | 19ba2283492c9fcb73ceb28e694302d4bdb37274 (patch) | |
| tree | 28746f602759123edc975649fc0ab5a4c429ea53 | |
| parent | 932ed40f0699252726fb499f3405406b9b1e387d (diff) | |
| parent | ebb6f001390464470f8cc78a40fc086e9e85ab9a (diff) | |
| download | libcxx-19ba2283492c9fcb73ceb28e694302d4bdb37274.tar.gz | |
Snap for 10929834 from ebb6f001390464470f8cc78a40fc086e9e85ab9a to sdk-release
Change-Id: I3b76db9a2bbd58cdeaf16681db5619fe08607f20
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | include/support/android/locale_bionic.h | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp index c759964f2..53950990c 100644 --- a/Android.bp +++ b/Android.bp @@ -191,10 +191,6 @@ cc_library_shared { 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 ee209ecb5..1f9c9b040 100644 --- a/include/support/android/locale_bionic.h +++ b/include/support/android/locale_bionic.h @@ -26,14 +26,15 @@ extern "C" { #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 |