Move Android to the builtin rune table.
llvm-svn: 231897
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 900086de8817c49724fa7b71edcbd7155ca955fa
diff --git a/include/__config b/include/__config
index c105518..5dc6c82 100644
--- a/include/__config
+++ b/include/__config
@@ -719,4 +719,8 @@
_LIBCPP_HAS_NO_THREADS is defined.
#endif
+#if defined(__ANDROID__)
+#define _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE
+#endif
+
#endif // _LIBCPP_CONFIG
diff --git a/include/__locale b/include/__locale
index 4efdc2d..625d0f8 100644
--- a/include/__locale
+++ b/include/__locale
@@ -353,15 +353,13 @@
static const mask punct = _PUNCT;
static const mask xdigit = _HEX;
static const mask blank = _BLANK;
-#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__) || defined(__ANDROID__)
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__)
# ifdef __APPLE__
typedef __uint32_t mask;
# elif defined(__FreeBSD__)
typedef unsigned long mask;
# elif defined(__EMSCRIPTEN__) || defined(__NetBSD__)
typedef unsigned short mask;
-# elif defined(__ANDROID__)
- typedef unsigned char mask;
# endif
static const mask space = _CTYPE_S;
static const mask print = _CTYPE_R;
@@ -371,11 +369,7 @@
static const mask alpha = _CTYPE_A;
static const mask digit = _CTYPE_D;
static const mask punct = _CTYPE_P;
-# if defined(__ANDROID__)
- static const mask xdigit = _CTYPE_X | _CTYPE_D;
-# else
static const mask xdigit = _CTYPE_X;
-# endif
# if defined(__NetBSD__)
static const mask blank = _CTYPE_BL;