Skip to content

Commit aa2d78f

Browse files
Allow prebuilt OpenSSL Android library path to be provided
1 parent 67eb06a commit aa2d78f

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ build-release:
3232
-PdebugBuild=false \
3333
-PsqlcipherRoot="$(SQLCIPHER_ROOT)" \
3434
-PopensslRoot="$(OPENSSL_ROOT)" \
35+
-PopenssslAndroidNativeRoot="$(OPENSSL_ANDROID_LIB_ROOT)"
3536
-PsqlcipherCFlags="$(SQLCIPHER_CFLAGS)" \
3637
-PsqlcipherAndroidClientVersion="$(SQLCIPHER_ANDROID_VERSION)"
3738

build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ ext {
6767
if(project.hasProperty('sqlcipherRoot')) {
6868
sqlcipherDir = "${sqlcipherRoot}"
6969
}
70-
androidNativeRootDir = "${nativeRootOutputDir}/external/android-libs"
70+
if(project.hasProperty('openssslAndroidNativeRoot')) {
71+
androidNativeRootDir = "${openssslAndroidNativeRoot}"
72+
} else {
73+
androidNativeRootDir = "${nativeRootOutputDir}/external/android-libs"
74+
}
7175
if(project.hasProperty('opensslRoot')) {
7276
opensslDir = "${opensslRoot}"
7377
}

0 commit comments

Comments
 (0)