Merge remote-tracking branch 'origin/prerelease'

Author: developernotes

.gitignore

@@ -10,3 +10,4 @@ bin/
 gen/
 external/openssl
 external/sqlcipher
+libs/

Makefile

@@ -61,6 +61,9 @@ clean:
 	-rm ${LIBRARY_ROOT}/x86/libsqlcipher_android.so
 	-rm ${LIBRARY_ROOT}/x86/libdatabase_sqlcipher.so
 	-rm ${LIBRARY_ROOT}/x86/libstlport_shared.so
+	-rm ${LIBRARY_ROOT}/armeabi-v7a/libsqlcipher_android.so
+	-rm ${LIBRARY_ROOT}/armeabi-v7a/libdatabase_sqlcipher.so
+	-rm ${LIBRARY_ROOT}/armeabi-v7a/libstlport_shared.so
 
 copy-libs:
 	mkdir -p ${LIBRARY_ROOT}/armeabi
@@ -78,6 +81,13 @@ copy-libs:
 		${LIBRARY_ROOT}/x86 && \
 	cp ${EXTERNAL_DIR}/libs/x86/libstlport_shared.so \
 		 ${LIBRARY_ROOT}/x86
+	mkdir -p ${LIBRARY_ROOT}/armeabi-v7a
+	cp ${EXTERNAL_DIR}/libs/armeabi-v7a/libsqlcipher_android.so \
+		 ${LIBRARY_ROOT}/armeabi-v7a  && \
+	cp ${JNI_DIR}/libs/armeabi-v7a/libdatabase_sqlcipher.so \
+		${LIBRARY_ROOT}/armeabi-v7a && \
+	cp ${EXTERNAL_DIR}/libs/armeabi-v7a/libstlport_shared.so \
+		 ${LIBRARY_ROOT}/armeabi-v7a
 
 copy-libs-dist:
 	cp ${LIBRARY_ROOT}/*.jar dist/SQLCipherForAndroid-SDK/libs/ && \

build-openssl-libraries.sh

@@ -40,6 +40,7 @@
         no-ocsp no-x509v3 no-ui no-srp no-ssltrace no-tlsext \
         no-mdc2 no-ecdh no-engine no-tls2 no-srtp
 
+    # arm build
     ${ANDROID_NDK_ROOT}/build/tools/make-standalone-toolchain.sh \
         --platform=${ANDROID_PLATFORM_VERSION} \
         --install-dir=${ANDROID_TOOLCHAIN_DIR} \
@@ -59,6 +60,27 @@
 
     rm -rf ${ANDROID_TOOLCHAIN_DIR}
 
+    #armv7 build
+    ${ANDROID_NDK_ROOT}/build/tools/make-standalone-toolchain.sh \
+        --platform=${ANDROID_PLATFORM_VERSION} \
+        --install-dir=${ANDROID_TOOLCHAIN_DIR} \
+        --system=${TOOLCHAIN_SYSTEM} \
+        --arch=arm
+
+    export PATH=${ANDROID_TOOLCHAIN_DIR}/bin:$PATH
+
+    RANLIB=arm-linux-androideabi-ranlib \
+        AR=arm-linux-androideabi-ar \
+        CC=arm-linux-androideabi-gcc \
+        ./Configure android-armv7 ${OPENSSL_EXCLUSION_LIST}
+
+    make build_crypto
+
+    mv libcrypto.a ../android-libs/armeabi-v7a/
+
+    rm -rf ${ANDROID_TOOLCHAIN_DIR}    
+
+    # x86 build
     ${ANDROID_NDK_ROOT}/build/tools/make-standalone-toolchain.sh \
         --platform=${ANDROID_PLATFORM_VERSION} \
         --install-dir=${ANDROID_TOOLCHAIN_DIR} \