Fix for devices unable to locate 'signal' at runtime

Author: developernotes

Makefile

@@ -38,7 +38,11 @@ build-java:
 
 build-native:
 	cd ${JNI_DIR} && \
-	ndk-build V=1 --environment-overrides NDK_LIBS_OUT=$(JNI_DIR)/libs \
+	ndk-build V=1 --environment-overrides NDK_LIBS_OUT=$(JNI_DIR)/libs32 \
+		NDK_APPLICATION_MK=$(JNI_DIR)/Application32.mk \
+		SQLCIPHER_CFLAGS="${SQLCIPHER_CFLAGS}" && \
+	ndk-build V=1 --environment-overrides NDK_LIBS_OUT=$(JNI_DIR)/libs64 \
+		NDK_APPLICATION_MK=$(JNI_DIR)/Application64.mk \
 		SQLCIPHER_CFLAGS="${SQLCIPHER_CFLAGS}"
 
 clean-java:
@@ -47,7 +51,11 @@ clean-java:
 
 clean-ndk:
 	-cd ${JNI_DIR} && \
-	ndk-build clean
+	ndk-build clean --environment-overrides NDK_LIBS_OUT=$(JNI_DIR)/libs32 \
+		NDK_APPLICATION_MK=$(JNI_DIR)/Application32.mk  && \
+	ndk-build clean --environment-overrides NDK_LIBS_OUT=$(JNI_DIR)/libs64 \
+		NDK_APPLICATION_MK=$(JNI_DIR)/Application64.mk
+	-rm -rf ${JNI_DIR}/libs32 ${JNI_DIR}/libs64
 
 clean: clean-ndk clean-java
 	-cd ${SQLCIPHER_DIR} && \
@@ -58,7 +66,7 @@ distclean: clean
 	rm -rf ${EXTERNAL_DIR}/android-libs
 
 copy-libs:
-	cp -R ${JNI_DIR}/libs/* ${LIBS_DIR}
+	cp -R ${JNI_DIR}/libs32/* ${JNI_DIR}/libs64/* ${LIBS_DIR}
 
 release-aar:
 	-rm ${LIBS_DIR}/sqlcipher.jar

build-openssl-libraries.sh

@@ -7,7 +7,6 @@
     fi
 
     ANDROID_LIB_ROOT=../android-libs
-    ANDROID_PLATFORM_VERSION=android-23
     ANDROID_TOOLCHAIN_DIR=/tmp/sqlcipher-android-toolchain
     OPENSSL_CONFIGURE_OPTIONS="no-krb5 no-idea no-camellia \
         no-seed no-bf no-cast no-rc2 no-rc4 no-rc5 no-md2 \
@@ -49,30 +48,35 @@
                 TOOLCHAIN_PREFIX=arm-linux-androideabi
                 CONFIGURE_ARCH=android
                 PLATFORM_OUTPUT_DIR=armeabi
+                ANDROID_PLATFORM_VERSION=android-9
                 ;;
             armeabi-v7a)
                 TOOLCHAIN_ARCH=arm
                 TOOLCHAIN_PREFIX=arm-linux-androideabi
                 CONFIGURE_ARCH=android -march=armv7-a
                 PLATFORM_OUTPUT_DIR=armeabi-v7a
+                ANDROID_PLATFORM_VERSION=android-9
                 ;;
             x86)
                 TOOLCHAIN_ARCH=x86
                 TOOLCHAIN_PREFIX=i686-linux-android
                 CONFIGURE_ARCH=android-x86
                 PLATFORM_OUTPUT_DIR=x86
+                ANDROID_PLATFORM_VERSION=android-9
                 ;;
             x86_64)
                 TOOLCHAIN_ARCH=x86_64
                 TOOLCHAIN_PREFIX=x86_64-linux-android
                 CONFIGURE_ARCH=android64
                 PLATFORM_OUTPUT_DIR=x86_64
+                ANDROID_PLATFORM_VERSION=android-21
                 ;;
             arm64-v8a)
                 TOOLCHAIN_ARCH=arm64
                 TOOLCHAIN_PREFIX=aarch64-linux-android
                 CONFIGURE_ARCH=android64-aarch64
                 PLATFORM_OUTPUT_DIR=arm64-v8a
+                ANDROID_PLATFORM_VERSION=android-21
                 ;;                
             *)
                 echo "Unsupported build platform:${SQLCIPHER_TARGET_PLATFORM}"
@@ -84,7 +88,7 @@
                            --platform=${ANDROID_PLATFORM_VERSION} \
                            --install-dir=${ANDROID_TOOLCHAIN_DIR} \
                            --arch=${TOOLCHAIN_ARCH}
-        
+
         export PATH=${ANDROID_TOOLCHAIN_DIR}/bin:$PATH
         export CROSS_SYSROOT=${ANDROID_TOOLCHAIN_DIR}/sysroot
 

jni/Application.mk jni/Application32.mkjni/Application.mk renamed to jni/Application32.mk

@@ -1,5 +1,5 @@
 APP_PROJECT_PATH := $(shell pwd)
-APP_ABI := armeabi armeabi-v7a x86 x86_64 arm64-v8a
-APP_PLATFORM := 21
+APP_ABI := armeabi armeabi-v7a x86
+APP_PLATFORM := android-9
 APP_BUILD_SCRIPT := $(APP_PROJECT_PATH)/Android.mk
 APP_STL := stlport_static

jni/Application64.mk

@@ -0,0 +1,5 @@
+APP_PROJECT_PATH := $(shell pwd)
+APP_ABI := x86_64 arm64-v8a
+APP_PLATFORM := android-21
+APP_BUILD_SCRIPT := $(APP_PROJECT_PATH)/Android.mk
+APP_STL := stlport_static

jni/net_sqlcipher_CursorWindow.cpp

@@ -283,7 +283,7 @@ namespace sqlcipher {
       int64_t value;
       if (window->getLong(row, column, &value)) {
         char buf[32];
-        snprintf(buf, sizeof(buf), "%"PRId64"", value);
+        snprintf(buf, sizeof(buf), "%lld", value);
         return env->NewStringUTF((const char*)buf);
       }
       return NULL;
@@ -359,7 +359,7 @@ namespace sqlcipher {
       if (window->getLong(row, column, &value)) {
         int len;
         char buf[32];
-        len = snprintf(buf, sizeof(buf), "%"PRId64"", value);
+        len = snprintf(buf, sizeof(buf), "%lld", value);
         jint bufferLength = env->GetArrayLength(buffer);
         if(len > bufferLength || dst == NULL){
           jstring content = env->NewStringUTF(buf);