1 --- a/libcharset/lib/localcharset.c 2015-06-10 11:55:25.933870724 +0200
2 +++ b/libcharset/lib/localcharset.c 2015-06-10 11:55:39.578063493 +0200
5 #if !defined WIN32_NATIVE
7 -# if HAVE_LANGINFO_CODESET
8 +# if HAVE_LANGINFO_CODESET && !(defined __ANDROID__)
11 # if 0 /* see comment below */
12 @@ -124,7 +124,7 @@ get_charset_aliases (void)
16 -#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
17 +#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__ || defined __ANDROID__)
19 const char *base = "charset.alias";
21 @@ -338,6 +338,9 @@ get_charset_aliases (void)
22 "CP54936" "\0" "GB18030" "\0"
23 "CP65001" "\0" "UTF-8" "\0";
25 +# if defined __ANDROID__
26 + cp = "*" "\0" "UTF-8" "\0";
31 @@ -361,7 +364,7 @@ locale_charset (void)
35 -#if !(defined WIN32_NATIVE || defined OS2)
36 +#if !(defined WIN32_NATIVE || defined OS2 || defined __ANDROID__)
38 # if HAVE_LANGINFO_CODESET