Fix 32-bit native targets to use mmap instead of mmap64

Author: developernotes

android-database-sqlcipher/build-openssl-libraries.sh

@@ -50,7 +50,6 @@ MINIMUM_ANDROID_64_BIT_SDK_VERSION=$2
  esac
 
  rm -rf ${ANDROID_LIB_ROOT}
- #git clean -dfx && git checkout -f
  ./Configure dist
 
  for SQLCIPHER_TARGET_PLATFORM in armeabi armeabi-v7a x86 x86_64 arm64-v8a
@@ -63,34 +62,39 @@ MINIMUM_ANDROID_64_BIT_SDK_VERSION=$2
              CONFIGURE_ARCH=android
              PLATFORM_OUTPUT_DIR=armeabi
              ANDROID_API_VERSION=${MINIMUM_ANDROID_SDK_VERSION}
+             OFFSET_BITS=32
              ;;
          armeabi-v7a)
              TOOLCHAIN_ARCH=arm
              TOOLCHAIN_PREFIX=arm-linux-androideabi
              CONFIGURE_ARCH=android -march=armv7-a
              PLATFORM_OUTPUT_DIR=armeabi-v7a
              ANDROID_API_VERSION=${MINIMUM_ANDROID_SDK_VERSION}
+             OFFSET_BITS=32
              ;;
          x86)
              TOOLCHAIN_ARCH=x86
              TOOLCHAIN_PREFIX=i686-linux-android
              CONFIGURE_ARCH=android-x86
              PLATFORM_OUTPUT_DIR=x86
              ANDROID_API_VERSION=${MINIMUM_ANDROID_SDK_VERSION}
+             OFFSET_BITS=32
              ;;
          x86_64)
              TOOLCHAIN_ARCH=x86_64
              TOOLCHAIN_PREFIX=x86_64-linux-android
              CONFIGURE_ARCH=android64
              PLATFORM_OUTPUT_DIR=x86_64
              ANDROID_API_VERSION=${MINIMUM_ANDROID_64_BIT_SDK_VERSION}
+             OFFSET_BITS=64
              ;;
          arm64-v8a)
              TOOLCHAIN_ARCH=arm64
              TOOLCHAIN_PREFIX=aarch64-linux-android
              CONFIGURE_ARCH=android64-aarch64
              PLATFORM_OUTPUT_DIR=arm64-v8a
              ANDROID_API_VERSION=${MINIMUM_ANDROID_64_BIT_SDK_VERSION}
+             OFFSET_BITS=64
              ;;
          *)
              echo "Unsupported build platform:${SQLCIPHER_TARGET_PLATFORM}"
@@ -118,6 +122,7 @@ MINIMUM_ANDROID_64_BIT_SDK_VERSION=$2
            CC=${TOOLCHAIN_PREFIX}-gcc \
            ./Configure "${CONFIGURE_ARCH}" \
            -D__ANDROID_API__=${ANDROID_API_VERSION} \
+           -D_FILE_OFFSET_BITS=${OFFSET_BITS} \
            "${OPENSSL_CONFIGURE_OPTIONS}"
 
      if [ $? -ne 0 ]; then

android-database-sqlcipher/native.gradle

@@ -32,10 +32,25 @@ task buildNative() {
   description "Build the native SQLCipher binaries"
   doLast {
     executeNdkBuild(
-      "${nativeRootOutputDir}/libs",
+      "${nativeRootOutputDir}/libs32",
       file("src/main/cpp").absolutePath,
-      file("src/main/cpp/Application.mk").absolutePath,
+      file("src/main/cpp/Application32.mk").absolutePath,
       "${sqlcipherCFlags}")
+    executeNdkBuild(
+      "${nativeRootOutputDir}/libs64",
+      file("src/main/cpp").absolutePath,
+      file("src/main/cpp/Application64.mk").absolutePath,
+      "${sqlcipherCFlags}")
+    exec {
+      workingDir "${nativeRootOutputDir}"
+      commandLine "mkdir", "-p", "libs"
+    }
+    copy {
+      from fileTree("${nativeRootOutputDir}/libs32").include("*/*")
+      into "${nativeRootOutputDir}/libs"
+      from fileTree("${nativeRootOutputDir}/libs64").include("*/*")
+      into "${nativeRootOutputDir}/libs"
+    }
   }
 }
 
@@ -59,7 +74,7 @@ task cleanNative() {
   description "Clean the native (JNI) build artifacts"
   doLast {
     logger.info "Cleaning native build artifacts"
-    ["libs", "obj"].each {
+    ["libs", "libs32", "libs64", "obj"].each {
       File file = new File("${projectDir}/src/main/${it}")
       if(file.exists()){
         file.deleteDir()

android-database-sqlcipher/src/main/cpp/Application32.mk

@@ -0,0 +1,6 @@
+APP_PROJECT_PATH := $(shell pwd)
+APP_ABI := armeabi armeabi-v7a x86
+APP_PLATFORM := android-21
+APP_BUILD_SCRIPT := $(APP_PROJECT_PATH)/Android.mk
+APP_STL := stlport_static
+APP_CFLAGS := -D_FILE_OFFSET_BITS=32

android-database-sqlcipher/src/main/cpp/Application.mk renamed to android-database-sqlcipher/src/main/cpp/Application64.mk

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

android-database-sqlcipher/src/main/java/net/sqlcipher/database/SQLiteDatabase.java

@@ -78,7 +78,7 @@ public class SQLiteDatabase extends SQLiteClosable {
   /**
    * The version number of the SQLCipher for Android Java client library.
    */
-    public static final String SQLCIPHER_ANDROID_VERSION = "3.5.8";
+    public static final String SQLCIPHER_ANDROID_VERSION = "3.5.9";
 
     // Stores reference to all databases opened in the current process.
     // (The referent Object is not used at this time.)

build.gradle

@@ -16,7 +16,7 @@ allprojects {
 }
 
 ext {
-  clientVersionNumber = "3.5.8"
+  clientVersionNumber = "3.5.9"
   mavenPackaging = "aar"
   mavenGroup = "net.zetetic"
   mavenArtifactId = "android-database-sqlcipher"