Use the ucd-tools toupper/tolower APIs instead of the Android versions.

android/jni/Android.mk

@@ -23,6 +23,7 @@ BLACKLIST_SRC_FILES := \
 ESPEAK_SRC_PATH := ../../src
 
 ESPEAK_SRC_FILES := \
+  $(LOCAL_PATH)/../../../ucd-tools/src/case.cpp \
   $(LOCAL_PATH)/../../../ucd-tools/src/categories.cpp \
   $(LOCAL_PATH)/../../../ucd-tools/src/ctype.cpp \
   $(subst $(LOCAL_PATH)/$(ESPEAK_SRC_PATH),$(ESPEAK_SRC_PATH),$(wildcard $(LOCAL_PATH)/$(ESPEAK_SRC_PATH)/*.c*))

src/android_wchar.h

@@ -36,5 +36,8 @@
 #define iswspace(c) ucd::isspace(c)
 #define iswupper(c) ucd::isupper(c)
 
+#define towlower(c) ucd::tolower(c)
+#define towupper(c) ucd::toupper(c)
+
 #endif
 #endif

ucd-tools

@@ -1 +1 @@
-Subproject commit e3e85d33f2949cdb29fa1090c0165d6117aa9217
+Subproject commit 9c3a87dbebe7547edd0125f59a581284d5d8dd80