Merge branch 'openssl' into prerelease

Author: developernotes

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "external/openssl"]
 	path = external/openssl
-	url = https://github.com/guardianproject/openssl-android.git
+	url = git://git.openssl.org/openssl.git
 [submodule "external/sqlcipher"]
 	path = external/sqlcipher
 	url = https://github.com/sqlcipher/sqlcipher.git

Makefile

@@ -47,10 +47,10 @@ release:
 
 clean:
 	-rm SQLCipher\ for\ Android\*.zip
-	ant clean
-	cd ${EXTERNAL_DIR} && ndk-build clean
+	-ant clean
+	-cd ${EXTERNAL_DIR} && ndk-build clean
 	-cd ${SQLCIPHER_DIR} && make clean
-	cd ${JNI_DIR} && ndk-build clean
+	-cd ${JNI_DIR} && ndk-build clean
 	-rm ${LIBRARY_ROOT}/armeabi/libsqlcipher_android.so
 	-rm ${LIBRARY_ROOT}/armeabi/libdatabase_sqlcipher.so
 	-rm ${LIBRARY_ROOT}/armeabi/libstlport_shared.so
@@ -79,3 +79,6 @@ copy-libs:
 copy-libs-dist:
 	cp ${LIBRARY_ROOT}/*.jar dist/SQLCipherForAndroid-SDK/libs/ && \
 	cp ${LIBRARY_ROOT}/armeabi/*.so dist/SQLCipherForAndroid-SDK/libs/armeabi/
+
+build-openssl-libraries:
+	./build-openssl-libraries.sh

build-openssl-libraries.sh

@@ -0,0 +1,78 @@
+(cd external/openssl;
+
+    if [ ! ${ANDROID_NDK_ROOT} ]; then
+        echo "ANDROID_NDK_ROOT environment variable not set, set and rerun"
+        exit 1
+    fi
+
+    HOST_INFO=`uname -a`
+    case ${HOST_INFO} in
+        Darwin*)
+            TOOLCHAIN_SYSTEM=darwin-x86_64
+            ;;
+        Linux*)
+            if [[ "${HOST_INFO}" == *i686* ]]
+            then
+                TOOLCHAIN_SYSTEM=linux-x86
+            else
+                TOOLCHAIN_SYSTEM=linux-x86_64
+            fi
+            ;;
+        *)
+            echo "Toolchain unknown for host system"
+            exit 1
+            ;;
+    esac
+
+    rm ../android-libs/armeabi/libcrypto.a \
+        ../android-libs/x86/libcrypto.a
+
+    git clean -dfx && git checkout -f
+    ./Configure dist
+
+    ANDROID_PLATFORM_VERSION=android-14
+    ANDROID_TOOLCHAIN_DIR=/tmp/sqlcipher-android-toolchain
+    OPENSSL_EXCLUSION_LIST=no-krb5 no-gost no-idea no-camellia \
+        no-seed no-bf no-cast no-rc2 no-rc4 no-rc5 no-md2 \
+        no-md4 no-ripemd no-rsa no-ecdh no-sock no-ssl2 no-ssl3 \
+        no-dsa no-dh no-ec no-ecdsa no-tls1 no-x509 no-pkcs7 \
+        no-pbe no-pkcs no-tlsext no-pem no-rfc3779 no-whirlpool \
+        no-ocsp no-x509v3 no-ui no-srp no-ssltrace no-tlsext \
+        no-mdc2 no-ecdh no-engine no-tls2 no-srtp
+
+    ${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 ${OPENSSL_EXCLUSION_LIST}
+
+    make build_crypto
+
+    mv libcrypto.a ../android-libs/armeabi/
+
+    rm -rf ${ANDROID_TOOLCHAIN_DIR}
+
+    ${ANDROID_NDK_ROOT}/build/tools/make-standalone-toolchain.sh \
+        --platform=${ANDROID_PLATFORM_VERSION} \
+        --install-dir=${ANDROID_TOOLCHAIN_DIR} \
+        --system=${TOOLCHAIN_SYSTEM} \
+        --arch=x86
+
+    export PATH=${ANDROID_TOOLCHAIN_DIR}/bin:$PATH
+
+    RANLIB=i686-linux-android-ranlib \
+        AR=i686-linux-android-ar \
+        CC=i686-linux-android-gcc \
+        ./Configure android-x86 ${OPENSSL_EXCLUSION_LIST}
+
+    make build_crypto
+
+    mv libcrypto.a ../android-libs/x86/
+)

external/Android.mk

@@ -41,15 +41,21 @@ sqlcipher_cflags := -DSQLITE_HAS_CODEC -DHAVE_FDATASYNC=0 -Dfdatasync=fsync
 
 include $(CLEAR_VARS)
 
+LOCAL_STATIC_LIBRARIES += static-libcrypto
 LOCAL_CFLAGS += $(android_sqlite_cflags) $(sqlcipher_cflags)
-LOCAL_C_INCLUDES := includes openssl/include sqlcipher
+LOCAL_C_INCLUDES := includes sqlcipher
 LOCAL_LDFLAGS += $(project_ldflags)
-LOCAL_LDLIBS += -lcrypto
 LOCAL_MODULE    := libsqlcipher
 LOCAL_SRC_FILES := $(sqlcipher_files)
 
 include $(BUILD_STATIC_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := static-libcrypto
+LOCAL_EXPORT_C_INCLUDES := openssl/include
+LOCAL_SRC_FILES := android-libs/$(TARGET_ARCH_ABI)/libcrypto.a
+include $(PREBUILT_STATIC_LIBRARY)
+
 #------------------------------------------------------------------------------#
 # libsqlcipher_android (our version of Android's libsqlite_android)
 
@@ -73,7 +79,7 @@ LOCAL_ALLOW_UNDEFINED_SYMBOLS := false
 
 # TODO this needs to depend on libsqlcipher being built, how to do that?
 #LOCAL_REQUIRED_MODULES += libsqlcipher libicui18n libicuuc 
-LOCAL_STATIC_LIBRARIES := libsqlcipher libicui18n libicuuc
+LOCAL_STATIC_LIBRARIES := libsqlcipher libicui18n libicuuc static-libcrypto
 
 LOCAL_CFLAGS += $(android_sqlite_cflags) $(sqlite_cflags) \
 		-DOS_PATH_SEPARATOR="'/'" -DHAVE_SYS_UIO_H
@@ -87,7 +93,7 @@ LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/platform-frameworks-base/include
 
 LOCAL_LDFLAGS += -L${LOCAL_PATH}/android-libs/$(TARGET_ARCH_ABI)/ -L$(LOCAL_PATH)/libs/$(TARGET_ARCH_ABI)/
-LOCAL_LDLIBS := -llog -lutils -lcutils -lcrypto
+LOCAL_LDLIBS := -llog -lutils -lcutils
 LOCAL_MODULE := libsqlcipher_android
 LOCAL_MODULE_FILENAME := libsqlcipher_android
 LOCAL_SRC_FILES := $(libsqlite3_android_local_src_files)