Fixes for android build

build-android/build.sh

@@ -47,12 +47,12 @@ unzip -qo "$current_dir/dependencies/cyrus-sasl/cyrus-sasl-android-$cyrus_sasl_b
 cd "$current_dir/.."
 tar xzf "$current_dir/../build-mac/autogen-result.tar.gz"
 ./configure
-make prepare
+make stamp-prepare
 
 # Copy public headers to include
-cp -r include/libetpan "$current_dir/include"
+cp -rL include/libetpan "$current_dir/include"
 mkdir -p "$current_dir/$package_name-$build_version/include"
-cp -r include/libetpan "$current_dir/$package_name-$build_version/include"
+cp -rL include/libetpan "$current_dir/$package_name-$build_version/include"
 
 # Start building.
 for arch in $archs ; do

build-android/dependencies/openssl/build.sh

@@ -90,7 +90,7 @@ function build {
   
   mkdir -p "$current_dir/$package_name-$build_version"
   mkdir -p "$current_dir/$package_name-$build_version/libs/$arch_dir_name"
-  cp -r include "$current_dir/$package_name-$build_version"
+  cp -rL include "$current_dir/$package_name-$build_version"
   cp libcrypto.a libssl.a "$current_dir/$package_name-$build_version/libs/$arch_dir_name"
   cd "$current_dir"
   rm -rf src

build-android/jni/Android.mk

@@ -89,6 +89,7 @@ src_files = \
 ./src/low-level/mime/mailmime.c \
 ./src/low-level/mime/mailmime_content.c \
 ./src/low-level/mime/mailmime_decode.c \
+./src/low-level/mime/mailmime_encode.c \
 ./src/low-level/mime/mailmime_disposition.c \
 ./src/low-level/mime/mailmime_types.c \
 ./src/low-level/mime/mailmime_types_helper.c \