File tree Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Expand file tree Collapse file tree 2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ build-debug:
24
24
-PdebugBuild=true \
25
25
-PsqlcipherRoot=" $( SQLCIPHER_ROOT) " \
26
26
-PopensslRoot=" $( OPENSSL_ROOT) " \
27
- -PopenssslAndroidNativeRoot =" $( OPENSSL_ANDROID_LIB_ROOT) " \
27
+ -PopensslAndroidNativeRoot =" $( OPENSSL_ANDROID_LIB_ROOT) " \
28
28
-PsqlcipherCFlags=" $( SQLCIPHER_CFLAGS) " \
29
29
-PsqlcipherAndroidClientVersion=" $( SQLCIPHER_ANDROID_VERSION) "
30
30
@@ -33,7 +33,7 @@ build-release:
33
33
-PdebugBuild=false \
34
34
-PsqlcipherRoot=" $( SQLCIPHER_ROOT) " \
35
35
-PopensslRoot=" $( OPENSSL_ROOT) " \
36
- -PopenssslAndroidNativeRoot =" $( OPENSSL_ANDROID_LIB_ROOT) " \
36
+ -PopensslAndroidNativeRoot =" $( OPENSSL_ANDROID_LIB_ROOT) " \
37
37
-PsqlcipherCFlags=" $( SQLCIPHER_CFLAGS) " \
38
38
-PsqlcipherAndroidClientVersion=" $( SQLCIPHER_ANDROID_VERSION) "
39
39
Original file line number Diff line number Diff line change 67
67
if (project. hasProperty(' sqlcipherRoot' )) {
68
68
sqlcipherDir = " ${ sqlcipherRoot} "
69
69
}
70
- if (project. hasProperty(' openssslAndroidNativeRoot ' ) ) {
71
- androidNativeRootDir = " ${ openssslAndroidNativeRoot } "
70
+ if (project. hasProperty(' opensslAndroidNativeRoot ' ) && " ${ opensslAndroidNativeRoot } " ) {
71
+ androidNativeRootDir = " ${ opensslAndroidNativeRoot } "
72
72
} else {
73
73
androidNativeRootDir = " ${ nativeRootOutputDir} /external/android-libs"
74
74
}
You can’t perform that action at this time.
0 commit comments