Use single Application.mk file for all CPU arcitectures

Author: developernotes

Diff for: android-database-sqlcipher/build.gradle

@@ -36,13 +36,14 @@ android {
     }
   }
 
-  check.dependsOn editorconfigCheck
   clean.dependsOn cleanNative
-  preBuild.dependsOn([buildOpenSSL, buildAmalgamation])
+  check.dependsOn editorconfigCheck
+  buildNative.mustRunAfter buildAmalgamation
+  buildAmalgamation.mustRunAfter buildOpenSSL
+  preBuild.dependsOn([buildOpenSSL, buildAmalgamation, buildNative])
 
   afterEvaluate {
     android.libraryVariants.all { variant ->
-      variant.javaCompile.dependsOn(buildNative)
       variant.outputs.each { output ->
         def outputFile = output.outputFile
         if (outputFile != null && outputFile.name.endsWith(".aar")) {

Diff for: android-database-sqlcipher/native.gradle

@@ -35,26 +35,15 @@ task buildAmalgamation () {
 task buildNative() {
   description "Build the native SQLCipher binaries"
   doLast {
-    executeNdkBuild(
-      "${nativeRootOutputDir}/libs32",
-      file("src/main/cpp").absolutePath,
-      file("src/main/cpp/Application32.mk").absolutePath,
-      "${sqlcipherCFlags}", "${otherSqlcipherCFlags}")
-    executeNdkBuild(
-      "${nativeRootOutputDir}/libs64",
-      file("src/main/cpp").absolutePath,
-      file("src/main/cpp/Application64.mk").absolutePath,
-      "${sqlcipherCFlags}", "${otherSqlcipherCFlags}")
     exec {
       workingDir "${nativeRootOutputDir}"
       commandLine "mkdir", "-p", "libs"
     }
-    copy {
-      from fileTree("${nativeRootOutputDir}/libs32").include("*/*")
-      into "${nativeRootOutputDir}/libs"
-      from fileTree("${nativeRootOutputDir}/libs64").include("*/*")
-      into "${nativeRootOutputDir}/libs"
-    }
+    executeNdkBuild(
+      "${nativeRootOutputDir}/libs",
+      file("src/main/cpp").absolutePath,
+      file("src/main/cpp/Application.mk").absolutePath,
+      "${sqlcipherCFlags}", "${otherSqlcipherCFlags}")
   }
 }
 
@@ -123,7 +112,8 @@ def executeNdkBuild(outputDir, androidMkDirectory, applicationMkFile,
                                 "OPENSSL_DIR": "${opensslDir}",
                                 "SQLCIPHER_DIR": "${sqlcipherDir}",
                                 "SQLCIPHER_OTHER_CFLAGS" : "${otherSqlcipherCFlags}",
-                                "ANDROID_NATIVE_ROOT_DIR": "${androidNativeRootDir}"]
+                                "ANDROID_NATIVE_ROOT_DIR": "${androidNativeRootDir}",
+                                "NDK_APP_PLATFORM": "${targetAndroidSdkVersion}"]
     environment(environmentVariables)
     commandLine "ndk-build", "${ndkBuildType}",
     "--environment-overrides", outputDirectory,

Diff for: android-database-sqlcipher/src/main/cpp/Application.mk

@@ -0,0 +1,11 @@
+APP_PROJECT_PATH := $(shell pwd)
+APP_ABI := armeabi armeabi-v7a x86 x86_64 arm64-v8a
+APP_PLATFORM := android-$(NDK_APP_PLATFORM)
+APP_BUILD_SCRIPT := $(APP_PROJECT_PATH)/Android.mk
+APP_STL := stlport_static
+ifeq ($(TARGET_ARCH_ABI),$(filter $(TARGET_ARCH_ABI),armeabi armeabi-v7a x86))
+	APP_CFLAGS := -D_FILE_OFFSET_BITS=32
+else
+	APP_CFLAGS := -D_FILE_OFFSET_BITS=64
+endif
+APP_LDFLAGS += -Wl,--exclude-libs,ALL