Browse Source

Android: added ICONV_PREFIX as a build.sh env var

pull/2/merge
pepdev 6 years ago
parent
commit
af01c335ec
3 changed files with 5 additions and 3 deletions
  1. +2
    -1
      build-android/build.sh
  2. +1
    -1
      build-android/include/config.h
  3. +2
    -1
      build-android/jni/Android.mk

+ 2
- 1
build-android/build.sh View File

@ -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"


+ 1
- 1
build-android/include/config.h View File

@ -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 */


+ 2
- 1
build-android/jni/Android.mk View File

@ -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


Loading…
Cancel
Save