Use bionic's locale code.

The old code worked fine for our limited use cases, but didn't match with the bionic tests' expected values. Test: ./checkbuild.py && ./run_tests.py Bug: android/ndk#300 Change-Id: If94b56275ae86ce84e9d0e48f0118eb3b0fb224e
MIPS · Jul 12, 2017 · 14a246f · 14a246f
1 parent f2a36f4
commit 14a246f
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 371 deletions.
diff --git a/sources/android/support/Android.mk b/sources/android/support/Android.mk
@@ -51,9 +51,11 @@ android_support_c_includes += \
 android_support_cflags += \
     -include freebsd-compat.h \
     -D_BSD_SOURCE \
+    -D__BIONIC_BUILD_FOR_ANDROID_SUPPORT \
 
 android_support_sources := \
     $(BIONIC_PATH)/libc/bionic/c32rtomb.cpp \
+    $(BIONIC_PATH)/libc/bionic/locale.cpp \
     $(BIONIC_PATH)/libc/bionic/mbrtoc32.cpp \
     $(BIONIC_PATH)/libc/bionic/mbstate.cpp \
     $(BIONIC_PATH)/libc/bionic/wchar.cpp \
@@ -106,11 +108,6 @@ android_support_sources := \
 
 # These are old sources that should be purged/rewritten/taken from bionic.
 android_support_sources += \
-    src/locale/duplocale.c \
-    src/locale/freelocale.c \
-    src/locale/localeconv.c \
-    src/locale/newlocale.c \
-    src/locale/uselocale.c \
     src/wchar_support.c \
     src/wcstox/floatscan.c \
     src/wcstox/intscan.c \

diff --git a/sources/android/support/include/stdlib.h b/sources/android/support/include/stdlib.h
@@ -66,6 +66,12 @@ unsigned long strtoul_l(const char* nptr, char** endptr, int base,
                         locale_t locale);
 #endif // __ANDROID_API__ < 26
 
+#if defined(MB_CUR_MAX)
+size_t __ctype_get_mb_cur_max();
+#undef MB_CUR_MAX
+#define MB_CUR_MAX __ctype_get_mb_cur_max()
+#endif  // defined(MB_CUR_MAX)
+
 __END_DECLS
 
 #endif  // NDK_ANDROID_SUPPORT_STDLIB_H
diff --git a/sources/android/support/include/xlocale.h b/sources/android/support/include/xlocale.h
diff --git a/sources/android/support/src/locale/duplocale.c b/sources/android/support/src/locale/duplocale.c
diff --git a/sources/android/support/src/locale/freelocale.c b/sources/android/support/src/locale/freelocale.c
diff --git a/sources/android/support/src/locale/locale_impl.h b/sources/android/support/src/locale/locale_impl.h
diff --git a/sources/android/support/src/locale/localeconv.c b/sources/android/support/src/locale/localeconv.c
diff --git a/sources/android/support/src/locale/newlocale.c b/sources/android/support/src/locale/newlocale.c
diff --git a/sources/android/support/src/locale/setlocale.c b/sources/android/support/src/locale/setlocale.c