Skip to content

Commit d9f7f5e

Browse files
Adjust API support: 32-bit 14+, 64-bit 21+
1 parent f5bdc67 commit d9f7f5e

File tree

5 files changed

+31
-17
lines changed

5 files changed

+31
-17
lines changed

android-database-sqlcipher/native.gradle

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,26 @@ task buildAmalgamation () {
3636
task buildNative() {
3737
description "Build the native SQLCipher binaries"
3838
doLast {
39+
executeNdkBuild(
40+
"${nativeRootOutputDir}/libs32",
41+
file("src/main/cpp").absolutePath,
42+
file("src/main/cpp/Application32.mk").absolutePath,
43+
"${sqlcipherCFlags}", "${otherSqlcipherCFlags}")
44+
executeNdkBuild(
45+
"${nativeRootOutputDir}/libs64",
46+
file("src/main/cpp").absolutePath,
47+
file("src/main/cpp/Application64.mk").absolutePath,
48+
"${sqlcipherCFlags}", "${otherSqlcipherCFlags}")
3949
exec {
4050
workingDir "${nativeRootOutputDir}"
4151
commandLine "mkdir", "-p", "libs"
4252
}
43-
executeNdkBuild(
44-
"${nativeRootOutputDir}/libs",
45-
file("src/main/cpp").absolutePath,
46-
file("src/main/cpp/Application.mk").absolutePath,
47-
"${sqlcipherCFlags}", "${otherSqlcipherCFlags}")
53+
copy {
54+
from fileTree("${nativeRootOutputDir}/libs32").include("*/*")
55+
into "${nativeRootOutputDir}/libs"
56+
from fileTree("${nativeRootOutputDir}/libs64").include("*/*")
57+
into "${nativeRootOutputDir}/libs"
58+
}
4859
}
4960
}
5061

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

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
APP_PROJECT_PATH := $(shell pwd)
2+
APP_ABI := armeabi armeabi-v7a x86
3+
APP_PLATFORM := android-$(NDK_APP_PLATFORM)
4+
APP_BUILD_SCRIPT := $(APP_PROJECT_PATH)/Android.mk
5+
APP_STL := stlport_static
6+
APP_CFLAGS := -D_FILE_OFFSET_BITS=32
7+
APP_LDFLAGS += -Wl,--exclude-libs,ALL
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
APP_PROJECT_PATH := $(shell pwd)
2+
APP_ABI := x86_64 arm64-v8a
3+
APP_PLATFORM := android-$(NDK_APP_PLATFORM)
4+
APP_BUILD_SCRIPT := $(APP_PROJECT_PATH)/Android.mk
5+
APP_STL := stlport_static
6+
APP_CFLAGS := -D_FILE_OFFSET_BITS=64
7+
APP_LDFLAGS += -Wl,--exclude-libs,ALL

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ ext {
5656
mavenDeveloperEmail = "support@zetetic.net"
5757
mavenDeveloperOrganization = "Zetetic LLC"
5858
mavenDeveloperUrl = "https://www.zetetic.net"
59-
minimumAndroidSdkVersion = 21
59+
minimumAndroidSdkVersion = 14
6060
minimumAndroid64BitSdkVersion = 21
6161
targetAndroidSdkVersion = 26
6262
compileAndroidSdkVersion = 26

0 commit comments

Comments
 (0)