Remove need for OPENSSL_ANDROID_LIB_ROOT environment variable in build

Author: developernotes

Makefile

@@ -7,7 +7,8 @@ clean:
 	$(GRADLE) clean
 
 distclean:
-	$(GRADLE) distclean
+	$(GRADLE) distclean \
+	-PsqlcipherRoot="$(SQLCIPHER_ROOT)"
 
 build-openssl:
 	$(GRADLE) buildOpenSSL
@@ -18,16 +19,19 @@ check:
 format:
 	$(GRADLE) editorconfigFormat
 
-build-debug: check
+build-debug:
 	$(GRADLE) android-database-sqlcipher:bundleDebugAar \
-	-PdebugBuild=true
+	-PdebugBuild=true \
+	-PsqlcipherRoot="$(SQLCIPHER_ROOT)" \
+	-PopensslRoot="$(OPENSSL_ROOT)" \
+	-PsqlcipherCFlags="$(SQLCIPHER_CFLAGS)" \
+	-PsqlcipherAndroidClientVersion="$(SQLCIPHER_ANDROID_VERSION)"
 
 build-release:
 	$(GRADLE) android-database-sqlcipher:bundleReleaseAar \
 	-PdebugBuild=false \
 	-PsqlcipherRoot="$(SQLCIPHER_ROOT)" \
 	-PopensslRoot="$(OPENSSL_ROOT)" \
-	-PopensslAndroidLibRoot="$(OPENSSL_ANDROID_LIB_ROOT)" \
 	-PsqlcipherCFlags="$(SQLCIPHER_CFLAGS)" \
 	-PsqlcipherAndroidClientVersion="$(SQLCIPHER_ANDROID_VERSION)"
 

README.md

@@ -144,7 +144,6 @@ SQLCIPHER_ROOT=/some/path/to/sqlcipher-folder \
 OPENSSL_ROOT=/some/path/to/openssl-folder \
 SQLCIPHER_ANDROID_VERSION="4.4.3" \
 SQLCIPHER_CFLAGS="-DSQLITE_HAS_CODEC" \
-OPENSSL_ANDROID_LIB_ROOT=/some/path/for/android/native/lib/creation \
 make build-release
 ```
 

android-database-sqlcipher/native.gradle

@@ -11,6 +11,10 @@ task buildOpenSSL() {
     return !armNativeFile.exists()
   }
   doLast {
+    def nativeRootDirectory = new File("${androidNativeRootDir}")
+    if(!nativeRootDirectory.exists()){
+      nativeRootDirectory.mkdirs()
+    }
     exec {
       workingDir "${projectDir}"
       commandLine "./build-openssl-libraries.sh",
@@ -79,13 +83,13 @@ task buildNative() {
 }
 
 task cleanOpenSSL() {
-  description "Clean the OpenSSL source"
+  description "Clean the OpenSSL native libraries"
   doLast {
-    logger.info "Cleaning OpenSSL source"
+    logger.info "Cleaning OpenSSL native libraries"
     exec {
-      workingDir "${opensslDir}"
+      workingDir "${androidNativeRootDir}"
       ignoreExitValue true
-      commandLine "make", "clean"
+      commandLine "rm", "-rf"
     }
   }
 }

build.gradle

@@ -67,11 +67,7 @@ ext {
   if(project.hasProperty('sqlcipherRoot')) {
     sqlcipherDir = "${sqlcipherRoot}"
   }
-  if(project.hasProperty('opensslAndroidLibRoot')) {
-    androidNativeRootDir = "${opensslAndroidLibRoot}"
-  } else {
-    androidNativeRootDir = "${nativeRootOutputDir}/external/android-libs"
-  }
+  androidNativeRootDir = "${nativeRootOutputDir}/external/android-libs"
   if(project.hasProperty('opensslRoot')) {
     opensslDir = "${opensslRoot}"
   }