File tree Expand file tree Collapse file tree 2 files changed +6
-1
lines changed
Expand file tree Collapse file tree 2 files changed +6
-1
lines changed Original file line number Diff line number Diff 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
Original file line number Diff line number Diff line change 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 }
You can’t perform that action at this time.
0 commit comments