diff options
| author | Dan Albert <danalbert@google.com> | 2018-02-07 20:23:22 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-07 20:23:22 +0000 |
| commit | 5a5968849d605c124aa30f964a250c3485338d4a (patch) | |
| tree | 5f3a056a1d56c90a7f0e53aa19d08a37261b0279 | |
| parent | aa09516d427061ebc79800e2cc9ff3c07ec153d0 (diff) | |
| parent | d59ce4d17a4ba908fd07f30f1ab2176fabf64f20 (diff) | |
| download | ndk-5a5968849d605c124aa30f964a250c3485338d4a.tar.gz | |
Merge "Adapt to new inlines in bionic." am: e5a77d9bca am: dfe6d31734android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-dev
am: d59ce4d17a
Change-Id: Ic22c8b10529e61f81ffcf783adb00a11fa5ac509
| -rw-r--r-- | r16/sources/cxx-stl/llvm-libc++/include/support/android/locale_bionic.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/r16/sources/cxx-stl/llvm-libc++/include/support/android/locale_bionic.h b/r16/sources/cxx-stl/llvm-libc++/include/support/android/locale_bionic.h index 482e23433..081035d45 100644 --- a/r16/sources/cxx-stl/llvm-libc++/include/support/android/locale_bionic.h +++ b/r16/sources/cxx-stl/llvm-libc++/include/support/android/locale_bionic.h @@ -25,7 +25,6 @@ extern "C" { #endif #include <support/xlocale/__posix_l_fallback.h> -#include <support/xlocale/__strtonum_fallback.h> #endif // defined(__BIONIC__) #endif // _LIBCPP_SUPPORT_ANDROID_LOCALE_BIONIC_H |