Skip to content

Commit 9e30582

Browse files
Make opensslAndroidNativeRoot non-required, correct spelling
1 parent 2fa791a commit 9e30582

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ build-debug:
2424
-PdebugBuild=true \
2525
-PsqlcipherRoot="$(SQLCIPHER_ROOT)" \
2626
-PopensslRoot="$(OPENSSL_ROOT)" \
27-
-PopenssslAndroidNativeRoot="$(OPENSSL_ANDROID_LIB_ROOT)" \
27+
-PopensslAndroidNativeRoot="$(OPENSSL_ANDROID_LIB_ROOT)" \
2828
-PsqlcipherCFlags="$(SQLCIPHER_CFLAGS)" \
2929
-PsqlcipherAndroidClientVersion="$(SQLCIPHER_ANDROID_VERSION)"
3030

@@ -33,7 +33,7 @@ build-release:
3333
-PdebugBuild=false \
3434
-PsqlcipherRoot="$(SQLCIPHER_ROOT)" \
3535
-PopensslRoot="$(OPENSSL_ROOT)" \
36-
-PopenssslAndroidNativeRoot="$(OPENSSL_ANDROID_LIB_ROOT)" \
36+
-PopensslAndroidNativeRoot="$(OPENSSL_ANDROID_LIB_ROOT)" \
3737
-PsqlcipherCFlags="$(SQLCIPHER_CFLAGS)" \
3838
-PsqlcipherAndroidClientVersion="$(SQLCIPHER_ANDROID_VERSION)"
3939

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ ext {
6767
if(project.hasProperty('sqlcipherRoot')) {
6868
sqlcipherDir = "${sqlcipherRoot}"
6969
}
70-
if(project.hasProperty('openssslAndroidNativeRoot')) {
71-
androidNativeRootDir = "${openssslAndroidNativeRoot}"
70+
if(project.hasProperty('opensslAndroidNativeRoot') && "${opensslAndroidNativeRoot}") {
71+
androidNativeRootDir = "${opensslAndroidNativeRoot}"
7272
} else {
7373
androidNativeRootDir = "${nativeRootOutputDir}/external/android-libs"
7474
}

0 commit comments

Comments
 (0)