Skip to content

Commit d5f1206

Browse files
Merge branch 'moreInfoInBuildFromSource' of https://github.com/hannesa2/android-database-sqlcipher into hannesa2-moreInfoInBuildFromSource
2 parents 3d7c924 + 5c3664d commit d5f1206

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,8 @@ android-database-sqlcipher/src/main/external/android-libs/
77
android-database-sqlcipher/.externalNativeBuild/
88
android-database-sqlcipher/src/main/libs*
99
android-database-sqlcipher/src/main/obj
10-
android-database-sqlcipher/src/main/external/openssl-*/
10+
android-database-sqlcipher/src/main/external/openssl-*/
11+
12+
local.properties
13+
*.iml
14+
.idea

android-database-sqlcipher/native.gradle

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1-
task buildOpenSSL () {
1+
import org.gradle.internal.logging.text.StyledTextOutputFactory
2+
import static org.gradle.internal.logging.text.StyledTextOutput.Style
3+
4+
task buildOpenSSL() {
25
onlyIf {
36
def armNativeFile = new File("${androidNativeRootDir}/armeabi/libcrypto.a")
7+
if (armNativeFile.exists()) {
8+
def out = services.get(StyledTextOutputFactory).create("")
9+
out.style(Style.Normal).text("${androidNativeRootDir}/armeabi/libcrypto.a exists").style(Style.Info).println(' SKIPPED')
10+
}
411
return !armNativeFile.exists()
512
}
613
doLast {
@@ -119,6 +126,15 @@ def gitClean(directory) {
119126
def executeNdkBuild(outputDir, androidMkDirectory, applicationMkFile,
120127
cflags, otherSqlcipherCFlags, androidVersion) {
121128
logger.info "Executing NDK build command"
129+
130+
def out = services.get(StyledTextOutputFactory).create("")
131+
out.style(Style.Normal).text("SQLCIPHER_CFLAGS=").style(Style.Info).println("${cflags}")
132+
out.style(Style.Normal).text("OPENSSL_DIR=").style(Style.Info).println("${opensslDir}")
133+
out.style(Style.Normal).text("SQLCIPHER_DIR=").style(Style.Info).println("${sqlcipherDir}")
134+
out.style(Style.Normal).text("SQLCIPHER_OTHER_CFLAGS=").style(Style.Info).println("${otherSqlcipherCFlags}")
135+
out.style(Style.Normal).text("ANDROID_NATIVE_ROOT_DIR=").style(Style.Info).println("${androidNativeRootDir}")
136+
out.style(Style.Normal).text("NDK_APP_PLATFORM=").style(Style.Info).println("${androidVersion}")
137+
122138
exec {
123139
def outputDirectory = "NDK_LIBS_OUT=${outputDir}"
124140
def applicationFile = "NDK_APPLICATION_MK=${applicationMkFile}"

0 commit comments

Comments
 (0)