Fixes for NDK r5b and r5-crystax.beta3

project/jni/application/setEnvironment.sh

@@ -13,8 +13,12 @@ LOCAL_PATH=`dirname $0`
 LOCAL_PATH=`cd $LOCAL_PATH && pwd`
 
 SCRIPT=setEnvironment-r4b.sh
-if [ -n "`echo $NDK | grep android-ndk-r5b`" ]; then
+CRYSTAX_WCHAR=
+if [ -n "`echo $NDK | grep 'android-ndk-r5b\|android-ndk-r5-crystax-1.beta3'`" ]; then
 	SCRIPT=setEnvironment-r5b.sh
+	if [ -n "`echo $NDK | grep 'android-ndk-r5-crystax-1.beta3'`" ]; then
+		CRYSTAX_WCHAR=1
+	fi
 fi
 
-$LOCAL_PATH/$SCRIPT "$@"
+env CRYSTAX_WCHAR=$CRYSTAX_WCHAR $LOCAL_PATH/$SCRIPT "$@"