Support arm64v8a and x86_64 (64-bit) in Sqlcipher

.gitmodules

@@ -18,4 +18,16 @@
 	url = https://github.com/android/platform_frameworks_base.git
 [submodule "external/icu4c"]
 	path = external/icu4c
-	url = https://github.com/android/platform_external_icu4c.git
+	url = https://github.com/android/platform_external_icu4c.git
+[submodule "external/libnativehelper"]
+	path = external/libnativehelper
+	url = https://android.googlesource.com/platform/libnativehelper
+[submodule "notepadbot"]
+	path = dist/SQLCipherForAndroid-SDK/samples/notepadbot
+	url = https://github.com/guardianproject/notepadbot.git
+[submodule "external/android-sqlite_lollipop"]
+	path = external/android-sqlite_lollipop
+	url = https://android.googlesource.com/platform/external/sqlite
+[submodule "external/platform-system-core-lollipop"]
+	path = external/platform-system-core-lollipop
+	url = https://android.googlesource.com/platform/system/core

.travis.yml

@@ -0,0 +1,28 @@
+language: java
+jdk: oraclejdk7
+install:
+- sudo apt-get update > /dev/null
+- sudo apt-get -qq install --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch
+- export TERM=dumb
+- wget http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
+- tar -zxf android-sdk_r24.4.1-linux.tgz
+- export ANDROID_HOME=`pwd`/android-sdk-linux
+- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+- wget http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin -O ndk.bin
+- chmod +x ndk.bin
+- "./ndk.bin > /dev/null"
+- ln -sf android-ndk-r10e android-ndk
+- export ANDROID_NDK_HOME=`pwd`/android-ndk
+- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_NDK_HOME}
+- echo "sdk.dir=$ANDROID_HOME" > local.properties
+- echo yes | android update sdk -a -t tools,platform-tools,extra-android-support,extra-android-m2repository,android-21,build-tools-21.0.2,extra-google-google_play_services,extra-google-m2repository
+  --force --no-ui
+script: make init && make && zip -r android-sqlcipher-gmetal.zip libs/* assets/*
+deploy:
+  provider: releases
+  api_key:
+    secure: cspljT77LBRZpCVq8oF4ltPpBk0Cwk5+DQMvT4fkqM3b+kf3+qBGwxdLO33jDUDwbE2od4xPVZFhFvsgMrl/CJjF0nevFQJzLOc+/35ATqJgWsQ8lujbSG/0J8NtO0cQ7f/gIS/QvPduHyopdmPOGyBEhLnGlSbtZDJWwPdj4h3WkZvPcwFN0rr+9iVYfj4vPby0mLpafvrPYqcOfIrj86qRD5zpSoC/qbBeDR/rahcHOcyw39dpb1mTL8ZcN1v5P6PtMH3e35+eKyBLE0uEEG2xUpocC6bU8tmrM6OsUSUwdpNGC6tpgFfNMRWNi9YvmpTf1aazKA0Xyj5ZJVDVRguI4pfzbjC6pf0b7QtwAMp5O+aSW+NAIP3X2WShTuBuYnJ6L5Ztwhu8a8SYOVhEWHOkpDPgznhd7+KtnZk3wniOLG2gMHvI06iWvrxPnUNSWD1QJBvWPp+HGzopIQz2qlcOD3Hu71lW1+3DshrKrkdRb618v5bsoCtCheWuKus08KI0cOH7ECDEKMufwzVqkpU7ebG/cdQ5mUmtjUEsXcR2cVvbl3WzAIPOu83iCujTYv+GIPnCBnoo3YbZOYcNInX9Vxs+UVAk5nyXZP1H0R64XY8Jx1KIhCduqowv0YZWc/PlmfAKhPpKZJRs/8/ObJ8mpDW4qXjmko4stXAgOmc=
+  file: android-sqlcipher-gmetal.zip
+  skip_cleanup: true
+  on:
+    repo: gmetal/android-database-sqlcipher

Makefile

@@ -83,14 +83,21 @@ clean:
 	-rm ${LIBRARY_ROOT}/armeabi/libsqlcipher_android.so
 	-rm ${LIBRARY_ROOT}/armeabi/libdatabase_sqlcipher.so
 	-rm ${LIBRARY_ROOT}/armeabi/libstlport_shared.so
+	-rm ${LIBRARY_ROOT}/arm64_v8a/libsqlcipher_android.so
+	-rm ${LIBRARY_ROOT}/arm64_v8a/libdatabase_sqlcipher.so
+	-rm ${LIBRARY_ROOT}/arm64_v8a/libstlport_shared.so
 	-rm ${LIBRARY_ROOT}/sqlcipher.jar
 	-rm ${LIBRARY_ROOT}/x86/libsqlcipher_android.so
 	-rm ${LIBRARY_ROOT}/x86/libdatabase_sqlcipher.so
 	-rm ${LIBRARY_ROOT}/x86/libstlport_shared.so
+	-rm ${LIBRARY_ROOT}/x86_64/libsqlcipher_android.so
+	-rm ${LIBRARY_ROOT}/x86_64/libdatabase_sqlcipher.so
+	-rm ${LIBRARY_ROOT}/x86_64/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
 	cp ${EXTERNAL_DIR}/libs/armeabi/libsqlcipher_android.so \
@@ -99,13 +106,27 @@ copy-libs:
 		${LIBRARY_ROOT}/armeabi && \
 	cp ${EXTERNAL_DIR}/libs/armeabi/libstlport_shared.so \
 		 ${LIBRARY_ROOT}/armeabi
+	mkdir -p ${LIBRARY_ROOT}/arm64-v8a
+	cp ${EXTERNAL_DIR}/libs/arm64-v8a/libsqlcipher_android.so \
+		 ${LIBRARY_ROOT}/arm64-v8a  && \
+	cp ${JNI_DIR}/libs/arm64-v8a/libdatabase_sqlcipher.so \
+		${LIBRARY_ROOT}/arm64-v8a && \
+	cp ${EXTERNAL_DIR}/libs/arm64-v8a/libstlport_shared.so \
+		 ${LIBRARY_ROOT}/arm64-v8a
 	mkdir -p ${LIBRARY_ROOT}/x86
 	cp ${EXTERNAL_DIR}/libs/x86/libsqlcipher_android.so \
 		 ${LIBRARY_ROOT}/x86  && \
 	cp ${JNI_DIR}/libs/x86/libdatabase_sqlcipher.so \
 		${LIBRARY_ROOT}/x86 && \
 	cp ${EXTERNAL_DIR}/libs/x86/libstlport_shared.so \
 		 ${LIBRARY_ROOT}/x86
+	mkdir -p ${LIBRARY_ROOT}/x86_64
+	cp ${EXTERNAL_DIR}/libs/x86_64/libsqlcipher_android.so \
+		 ${LIBRARY_ROOT}/x86_64  && \
+	cp ${JNI_DIR}/libs/x86_64/libdatabase_sqlcipher.so \
+		${LIBRARY_ROOT}/x86_64 && \
+	cp ${EXTERNAL_DIR}/libs/x86_64/libstlport_shared.so \
+		 ${LIBRARY_ROOT}/x86_64
 	mkdir -p ${LIBRARY_ROOT}/armeabi-v7a
 	cp ${EXTERNAL_DIR}/libs/armeabi-v7a/libsqlcipher_android.so \
 		 ${LIBRARY_ROOT}/armeabi-v7a  && \
@@ -116,7 +137,7 @@ copy-libs:
 
 copy-libs-dist:
 	cp ${LIBRARY_ROOT}/*.jar dist/SQLCipherForAndroid-SDK/libs/ && \
-	cp ${LIBRARY_ROOT}/armeabi/*.so dist/SQLCipherForAndroid-SDK/libs/armeabi/
+	cp ${LIBRARY_ROOT}/arm64_v8a/*.so dist/SQLCipherForAndroid-SDK/libs/arm64_v8a/
 
 build-openssl-libraries:
 	./build-openssl-libraries.sh

build-openssl-libraries.sh

@@ -26,7 +26,10 @@
     esac
 
     rm ../android-libs/armeabi/libcrypto.a \
-        ../android-libs/x86/libcrypto.a
+        ../android-libs/x86/libcrypto.a \
+        ../android-libs/arm64-v8a/libcrypto.a \
+        ../android-libs/x86_64/libcrypto.a
+
 
     git clean -dfx && git checkout -f
     ./Configure dist
@@ -98,4 +101,60 @@
     make clean
     make build_crypto
     mv libcrypto.a ../android-libs/x86/
+
+    rm -rf ${ANDROID_TOOLCHAIN_DIR}
+
+    make clean
+    git clean -dfx && git checkout -f
+
+    # Patch openssl to support building for arm64-v8a && x86_64
+    # Note, we only patch the Configure script
+    patch -p1 < ../../openssl_android_64_bit_support.patch
+
+    # arm64-v8a build
+    ANDROID_PLATFORM_VERSION=android-21
+    ${ANDROID_NDK_ROOT}/build/tools/make-standalone-toolchain.sh \
+        --platform=${ANDROID_PLATFORM_VERSION} \
+        --install-dir=${ANDROID_TOOLCHAIN_DIR} \
+        --system=${TOOLCHAIN_SYSTEM} \
+        --arch=arm64
+
+    export PATH=${ANDROID_TOOLCHAIN_DIR}/bin:$PATH
+
+    RANLIB=aarch64-linux-android-ranlib \
+        AR=aarch64-linux-android-ar \
+        CC=aarch64-linux-android-gcc \
+        ./Configure android-aarch64 ${OPENSSL_EXCLUSION_LIST}
+
+    make build_crypto
+
+    mv libcrypto.a ../android-libs/arm64-v8a/
+
+    rm -rf ${ANDROID_TOOLCHAIN_DIR}    
+
+    make clean
+    git clean -dfx && git checkout -f
+
+    patch -p1 < ../../openssl_android_64_bit_support.patch
+
+    # x86_64 build
+    ANDROID_PLATFORM_VERSION=android-21
+    ${ANDROID_NDK_ROOT}/build/tools/make-standalone-toolchain.sh \
+        --platform=${ANDROID_PLATFORM_VERSION} \
+        --install-dir=${ANDROID_TOOLCHAIN_DIR} \
+        --system=${TOOLCHAIN_SYSTEM} \
+        --arch=x86_64
+
+    export PATH=${ANDROID_TOOLCHAIN_DIR}/bin:$PATH
+
+    RANLIB=x86_64-linux-android-ranlib \
+        AR=x86_64-linux-android-ar \
+        CC=x86_64-linux-android-gcc \
+        ./Configure android-x86_64 ${OPENSSL_EXCLUSION_LIST}
+
+    make build_crypto
+
+    mv libcrypto.a ../android-libs/x86_64/
+
+    rm -rf ${ANDROID_TOOLCHAIN_DIR}    
 )

external/Android.mk

@@ -19,7 +19,7 @@ sqlcipher/sqlite3.c:
 copy-libs-hack: build-local-hack
 	install -p -m644 libs/armeabi/*.so ../obj/local/armeabi/
 
-project_ldflags:= -Llibs/$(TARGET_ARCH_ABI)/ -Landroid-libs/$(TARGET_ARCH_ABI)/
+project_ldflags:= -Llibs/$(TARGET_ARCH_ABI)/ -Landroid-libs/$(TARGET_ARCH_ABI)/ -fuse-ld=bfd
 
 #------------------------------------------------------------------------------#
 # libsqlite3
@@ -63,17 +63,24 @@ include $(PREBUILT_STATIC_LIBRARY)
 # libsqlcipher_android (our version of Android's libsqlite_android)
 
 # these are all files from various external git repos
-libsqlite3_android_local_src_files := \
+libsqlite3_android_local_src_files_32 := \
 	android-sqlite/android/sqlite3_android.cpp \
 	android-sqlite/android/PhonebookIndex.cpp \
 	android-sqlite/android/PhoneNumberUtils.cpp \
 	android-sqlite/android/OldPhoneNumberUtils.cpp \
 	android-sqlite/android/PhoneticStringUtils.cpp \
-	String16.cpp \
-	String8.cpp 
+	String16_32.cpp \
+	String8_32.cpp 
 #	android-sqlite/android/PhoneNumberUtilsTest.cpp \
 #	android-sqlite/android/PhoneticStringUtilsTest.cpp \
 
+libsqlite3_android_local_src_files_64 :=  \
+	android-sqlite_lollipop/android/sqlite3_android.cpp \
+	android-sqlite_lollipop/android/PhoneNumberUtils.cpp \
+	android-sqlite_lollipop/android/OldPhoneNumberUtils.cpp \
+	String16_64.cpp \
+	String8_64.cpp 
+
 include $(CLEAR_VARS)
 
 ## this might save us linking against the private android shared libraries like
@@ -87,20 +94,29 @@ LOCAL_STATIC_LIBRARIES := libsqlcipher libicui18n libicuuc static-libcrypto
 LOCAL_CFLAGS += $(android_sqlite_cflags) $(sqlite_cflags) \
 		-DOS_PATH_SEPARATOR="'/'" -DHAVE_SYS_UIO_H
 
-LOCAL_C_INCLUDES := \
-	$(LOCAL_PATH)/includes \
-	$(LOCAL_PATH)/sqlcipher \
-	$(LOCAL_PATH)/icu4c/i18n \
-	$(LOCAL_PATH)/icu4c/common \
-	$(LOCAL_PATH)/platform-system-core/include \
-	$(LOCAL_PATH)/platform-frameworks-base/include
-
 LOCAL_LDFLAGS += -fuse-ld=bfd
 LOCAL_LDFLAGS += -L${LOCAL_PATH}/android-libs/$(TARGET_ARCH_ABI)/ -L$(LOCAL_PATH)/libs/$(TARGET_ARCH_ABI)/
 LOCAL_LDLIBS := -llog -lutils -lcutils
 LOCAL_MODULE := libsqlcipher_android
 LOCAL_MODULE_FILENAME := libsqlcipher_android
-LOCAL_SRC_FILES := $(libsqlite3_android_local_src_files)
+
+ifeq ($(TARGET_ARCH_ABI), $(filter $(TARGET_ARCH_ABI), armeabi  armeabi-v7a x86))
+    LOCAL_SRC_FILES := $(libsqlite3_android_local_src_files_32)
+    LOCAL_C_INCLUDES := $(LOCAL_PATH)/includes/arch32 \
+      	$(LOCAL_PATH)/platform-system-core/include
+
+else ifeq ($(TARGET_ARCH_ABI), $(filter $(TARGET_ARCH_ABI), x86_64 arm64-v8a))
+    LOCAL_SRC_FILES := $(libsqlite3_android_local_src_files_64)
+    LOCAL_C_INCLUDES := $(LOCAL_PATH)/includes/arch64 \
+    	$(LOCAL_PATH)/platform-system-core-lollipop/include
+
+endif
+
+LOCAL_C_INCLUDES += \
+	$(LOCAL_PATH)/sqlcipher \
+	$(LOCAL_PATH)/icu4c/i18n \
+	$(LOCAL_PATH)/icu4c/common \
+	$(LOCAL_PATH)/platform-frameworks-base/include
 
 include $(BUILD_SHARED_LIBRARY)