Use single Application.mk for 32/64-bit native builds

Author: developernotes

android-database-sqlcipher/build.gradle

@@ -21,8 +21,7 @@ android {
 
   sourceSets {
     main {
-      jniLibs.srcDirs "${rootProject.ext.nativeRootOutputDir}/libs32/",
-      "${rootProject.ext.nativeRootOutputDir}/libs64/"
+      jniLibs.srcDirs "${rootProject.ext.nativeRootOutputDir}/libs"
     }
   }
 
@@ -32,7 +31,7 @@ android {
 
   afterEvaluate {
     android.libraryVariants.all { variant ->
-      variant.javaCompile.dependsOn([buildNative32, buildNative64])
+      variant.javaCompile.dependsOn(buildNative)
       variant.outputs.each { output ->
         def outputFile = output.outputFile
         if (outputFile != null && outputFile.name.endsWith(".aar")) {

android-database-sqlcipher/native.gradle

@@ -28,24 +28,13 @@ task buildAmalgamation () {
   }
 }
 
-task buildNative32() {
-  description "Build the 32-bit native SQLCipher binaries"
+task buildNative() {
+  description "Build the native SQLCipher binaries"
   doLast {
     executeNdkBuild(
-      "${nativeRootOutputDir}/libs32",
+      "${nativeRootOutputDir}/libs",
       file("src/main/cpp").absolutePath,
-      file("src/main/cpp/Application32.mk").absolutePath,
-      "${sqlcipherCFlags}")
-  }
-}
-
-task buildNative64() {
-  description "Build the 64-bit native SQLCipher binaries"
-  doLast {
-    executeNdkBuild(
-      "${nativeRootOutputDir}/libs64",
-      file("src/main/cpp").absolutePath,
-      file("src/main/cpp/Application64.mk").absolutePath,
+      file("src/main/cpp/Application.mk").absolutePath,
       "${sqlcipherCFlags}")
   }
 }
@@ -70,7 +59,7 @@ task cleanNative() {
   description "Clean the native (JNI) build artifacts"
   doLast {
     logger.info "Cleaning native build artifacts"
-    ["libs32", "libs64", "obj"].each {
+    ["libs", "obj"].each {
       new File("${projectDir}/src/main/${it}").deleteDir()
     }
   }

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

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