Build including native libraries

Author: developernotes

.gitignore

@@ -5,3 +5,5 @@ android-database-sqlcipher/src/main/external/sqlcipher
 android-database-sqlcipher/src/main/external/openssl
 android-database-sqlcipher/src/main/external/android-libs/
 android-database-sqlcipher/.externalNativeBuild/
+android-database-sqlcipher/src/main/libs*
+android-database-sqlcipher/src/main/obj

android-database-sqlcipher/build.gradle

@@ -1,4 +1,5 @@
-apply plugin: 'com.android.library'
+apply plugin: "com.android.library"
+apply from: "native.gradle"
 
 android {
 
@@ -9,56 +10,34 @@ android {
     minSdkVersion 14
     targetSdkVersion 26
     versionCode 1
-    versionName "1.0"
+    versionName "${rootProject.ext.clientVersionNumber}"
   }
 
   buildTypes {
     release {
       minifyEnabled false
-      //proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
     }
   }
 
-  externalNativeBuild {
-    ndkBuild {
-      path "${projectDir}/src/main/cpp/Android.mk"
+  sourceSets {
+    main {
+      jniLibs.srcDirs "${rootProject.ext.nativeRootOutputDir}/libs32/",
+      "${rootProject.ext.nativeRootOutputDir}/libs64/"
     }
   }
 
-  task buildOpenSSL (type:Exec) {
-    workingDir "${projectDir}"
-    commandLine "./build-openssl-libraries.sh"
+  task distclean(dependsOn: [clean, cleanSQLCipher, cleanOpenSSL]) {
+    description "Clean up build, SQLCipher, and OpenSSL artifacts"
   }
 
-  task buildAmalgamation () {
-    doLast {
-      exec {
-        workingDir "${projectDir}/src/main/external/sqlcipher"
-        environment("CFLAGS", "${rootProject.ext.sqlcipherCFlags}")
-        commandLine "./configure", "--enable-tempstore=yes", "--with-crypto-lib=none"
-      }
-      exec {
-        workingDir "${projectDir}/src/main/external/sqlcipher"
-        environment("CFLAGS", "${rootProject.ext.sqlcipherCFlags}")
-        commandLine "make",  "sqlite3.c"
-      }
-    }
-  }
+  clean.dependsOn cleanNative
 
   preBuild.dependsOn buildAmalgamation
 
-  // task cleanOpenSSL() {
-  //   println "OpenSSL dir:${rootProject.ext.opensslDir}"
-  //   println "Cleaning OpenSSL"
-  // }
-
-  // task cleanSQLCipher() {
-  //   println "SQLCipher dir:${rootProject.ext.sqlcipherDir}"
-  //   println "Cleaning SQLCipher"
-  // }
-
-}
+  afterEvaluate {
+    android.libraryVariants.all { variant ->
+      variant.javaCompile.dependsOn([buildNative32, buildNative64])
+    }
+  }
 
-dependencies {
-  compile fileTree(dir: 'libs', include: ['*.jar'])
 }

android-database-sqlcipher/native.gradle

@@ -0,0 +1,85 @@
+task buildOpenSSL (type:Exec) {
+  workingDir "${projectDir}"
+  commandLine "./build-openssl-libraries.sh"
+}
+
+task buildAmalgamation () {
+  doLast {
+    exec {
+      workingDir "${projectDir}/src/main/external/sqlcipher"
+      environment("CFLAGS", "${rootProject.ext.sqlcipherCFlags}")
+      commandLine "./configure", "--enable-tempstore=yes", "--with-crypto-lib=none"
+    }
+    exec {
+      workingDir "${projectDir}/src/main/external/sqlcipher"
+      environment("CFLAGS", "${rootProject.ext.sqlcipherCFlags}")
+      commandLine "make",  "sqlite3.c"
+    }
+  }
+}
+
+task buildNative32() {
+  description "Build the 32-bit native SQLCipher binaries"
+  doLast {
+    executeNdkBuild(
+      "${rootProject.ext.nativeRootOutputDir}/libs32",
+      file("src/main/cpp").absolutePath,
+      file("src/main/cpp/Application32.mk").absolutePath,
+      "${rootProject.ext.sqlcipherCFlags}")
+  }
+}
+
+task buildNative64() {
+  description "Build the 64-bit native SQLCipher binaries"
+  doLast {
+    executeNdkBuild(
+      "${rootProject.ext.nativeRootOutputDir}/libs64",
+      file("src/main/cpp").absolutePath,
+      file("src/main/cpp/Application64.mk").absolutePath,
+      "${rootProject.ext.sqlcipherCFlags}")
+  }
+}
+
+task cleanOpenSSL {
+  description "Clean the OpenSSL source"
+  doLast {
+    logger.info "Cleaning OpenSSL directory:${rootProject.ext.opensslDir}"
+    exec {
+      workingDir "${rootProject.ext.opensslDir}"
+      commandLine "git", "checkout", "-f"
+    }
+  }
+}
+
+task cleanSQLCipher() {
+  description "Clean the SQLCipher source"
+  doLast {
+    logger.info "Cleaning SQLCipher directory:${rootProject.ext.sqlcipherDir}"
+    exec {
+      workingDir "${rootProject.ext.sqlcipherDir}"
+      commandLine "git", "checkout", "-f"
+    }
+  }
+}
+
+task cleanNative() {
+  description "Clean the native (JNI) build artifacts"
+  doLast {
+    logger.info "Cleaning native build artifacts"
+    exec {
+      workingDir "${projectDir}/src/main"
+      commandLine "rm", "-rf", "libs32", "lib64", "obj"
+    }
+  }
+}
+
+def executeNdkBuild(outputDir, androidMkDirectory, applicationMkFile, cflags) {
+  logger.info "Executing NDK build command"
+  exec {
+    def outputDirectory = "NDK_LIBS_OUT=${outputDir}"
+    def applicationFile = "NDK_APPLICATION_MK=${applicationMkFile}"
+    environment("SQLCIPHER_CFLAGS", "${cflags}")
+    commandLine "ndk-build", "--environment-overrides", outputDirectory,
+    "-C", androidMkDirectory, applicationFile
+  }
+}

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

@@ -8,7 +8,7 @@ SQLCIPHER_SRC := $(SQLCIPHER_DIR)/sqlite3.c
 LOCAL_CFLAGS +=  $(SQLCIPHER_CFLAGS) -DLOG_NDEBUG
 LOCAL_C_INCLUDES := $(SQLCIPHER_DIR) $(LOCAL_PATH)
 LOCAL_LDLIBS := -llog -latomic
-LOCAL_LDFLAGS += -L$(LOCAL_PATH)/android-libs/$(TARGET_ARCH_ABI) -fuse-ld=bfd
+LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../external/android-libs/$(TARGET_ARCH_ABI) -fuse-ld=bfd
 LOCAL_STATIC_LIBRARIES += static-libcrypto
 LOCAL_MODULE    := libsqlcipher
 LOCAL_SRC_FILES := $(SQLCIPHER_SRC) \

build.gradle

@@ -19,6 +19,8 @@ allprojects {
 }
 
 ext {
+  clientVersionNumber = "3.5.7"
+  nativeRootOutputDir = "${projectDir}/${name}/src/main"
   sqlcipherDir = "${projectDir}/${name}/src/main/external/sqlcipher"
   opensslDir = "${projectDir}/${name}/src/main/external/openssl"  
   sqlcipherCFlags = "-DSQLITE_HAS_CODEC " +