Move OpenSSL artifact cleanup to distclean

developernotes · developernotes · commit 99a77aef3d42 · 2017-09-26T14:55:08.000-05:00
diff --git a/android-database-sqlcipher/native.gradle b/android-database-sqlcipher/native.gradle
@@ -71,12 +71,14 @@ task cleanNative() {
     ["libs32", "libs64", "obj"].each {
       new File("${projectDir}/src/main/${it}").deleteDir()
     }
-    new File("${androidNativeRootDir}/").deleteDir()
   }
 }
 
 task distclean(dependsOn: [clean, cleanSQLCipher, cleanOpenSSL]) {
   description "Clean build, SQLCipher, and OpenSSL artifacts"
+  doLast {
+    new File("${androidNativeRootDir}/").deleteDir()
+  }
 }
 
 def gitClean(directory) {
@@ -93,7 +95,8 @@ def executeNdkBuild(outputDir, androidMkDirectory, applicationMkFile, cflags) {
     def outputDirectory = "NDK_LIBS_OUT=${outputDir}"
     def applicationFile = "NDK_APPLICATION_MK=${applicationMkFile}"
     environment("SQLCIPHER_CFLAGS", "${cflags}")
-    commandLine "ndk-build", "--environment-overrides", outputDirectory,
+    commandLine "ndk-build",
+    "--environment-overrides", outputDirectory,
     "-C", androidMkDirectory, applicationFile
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -71,12 +71,14 @@ task cleanNative() {`
`71`	`71`	`["libs32", "libs64", "obj"].each {`
`72`	`72`	`new File("${projectDir}/src/main/${it}").deleteDir()`
`73`	`73`	`}`
`74`		`- new File("${androidNativeRootDir}/").deleteDir()`
`75`	`74`	`}`
`76`	`75`	`}`
`77`	`76`
`78`	`77`	`task distclean(dependsOn: [clean, cleanSQLCipher, cleanOpenSSL]) {`
`79`	`78`	`description "Clean build, SQLCipher, and OpenSSL artifacts"`
	`79`	`+ doLast {`
	`80`	`+ new File("${androidNativeRootDir}/").deleteDir()`
	`81`	`+ }`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`def gitClean(directory) {`
`@@ -93,7 +95,8 @@ def executeNdkBuild(outputDir, androidMkDirectory, applicationMkFile, cflags) {`
`93`	`95`	`def outputDirectory = "NDK_LIBS_OUT=${outputDir}"`
`94`	`96`	`def applicationFile = "NDK_APPLICATION_MK=${applicationMkFile}"`
`95`	`97`	`environment("SQLCIPHER_CFLAGS", "${cflags}")`
`96`		`- commandLine "ndk-build", "--environment-overrides", outputDirectory,`
	`98`	`+ commandLine "ndk-build",`
	`99`	`+ "--environment-overrides", outputDirectory,`
`97`	`100`	`"-C", androidMkDirectory, applicationFile`
`98`	`101`	`}`
`99`	`102`	`}`