Android: added ICONV_PREFIX as a build.sh env var

build-android/build.sh

@@ -30,7 +30,8 @@ function build {
   rm -rf "$current_dir/obj"
   
   cd "$current_dir/jni"
-  $ANDROID_NDK/ndk-build TARGET_PLATFORM=$ANDROID_PLATFORM TARGET_ARCH_ABI=$TARGET_ARCH_ABI
+  $ANDROID_NDK/ndk-build TARGET_PLATFORM=$ANDROID_PLATFORM TARGET_ARCH_ABI=$TARGET_ARCH_ABI \
+    ICONV_PATH=$ICONV_PREFIX
     # \
     # OPENSSL_PATH="$current_dir/third-party/openssl-android-$openssl_build_version" \
     # CYRUS_SASL_PATH="$current_dir/third-party/cyrus-sasl-android-$cyrus_sasl_build_version"

build-android/include/config.h

@@ -35,7 +35,7 @@
 #define HAVE_GETPAGESIZE 1
 
 /* Define if you have the iconv() function. */
-// #define HAVE_ICONV
+#define HAVE_ICONV
 
 /* prototype of iconv() has const parameters */
 /* #undef HAVE_ICONV_PROTO_CONST */

build-android/jni/Android.mk

@@ -140,7 +140,8 @@ src/driver/implementation/data-message \
 src/driver/interface
 
 LOCAL_C_INCLUDES = $(addprefix ../../, $(c_includes)) \
-  $(LOCAL_PATH)/../include $(LOCAL_PATH)/../include/libetpan 
+  $(LOCAL_PATH)/../include $(LOCAL_PATH)/../include/libetpan \
+  $(ICONV_PATH)/include
   # \
   # $(OPENSSL_PATH)/include $(CYRUS_SASL_PATH)/include