Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 05:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'unpack-tor-binaries-earlier' into 'master'

Browse Source 
Unpack Tor binaries earlier to avoid issues with task order

See merge request briar/briar!1742
This commit is contained in:
Torsten Grote
2022-11-11 18:21:31 +00:00
parent 3173486b3b f1be3031a7
commit bae97e3312
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bramble-android/build.gradle
View File

@@ -1,5 +1,3 @@
import com.android.build.gradle.tasks.MergeResources
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'witness' apply plugin: 'witness'
apply from: 'witness.gradle' apply from: 'witness.gradle'
@@ -59,12 +57,11 @@ dependencies {
testImplementation "org.jmock:jmock-imposters:$jmock_version" testImplementation "org.jmock:jmock-imposters:$jmock_version"
} }
def torBinariesDir = 'src/main/res/raw'
def torLibsDir = 'src/main/jniLibs' def torLibsDir = 'src/main/jniLibs'
task cleanTorBinaries { task cleanTorBinaries {
outputs.dir torLibsDir
doLast { doLast {
delete fileTree(torBinariesDir) { include '*.zip' }
delete fileTree(torLibsDir) { include '**/*.so' } delete fileTree(torLibsDir) { include '**/*.so' }
} }
} }
@@ -72,6 +69,7 @@ task cleanTorBinaries {
clean.dependsOn cleanTorBinaries clean.dependsOn cleanTorBinaries
task unpackTorBinaries { task unpackTorBinaries {
outputs.dir torLibsDir
doLast { doLast {
configurations.tor.each { outer -> configurations.tor.each { outer ->
zipTree(outer).each { inner -> zipTree(outer).each { inner ->
@@ -106,8 +104,4 @@ task unpackTorBinaries {
dependsOn cleanTorBinaries dependsOn cleanTorBinaries
} }
tasks.withType(MergeResources) { preBuild.dependsOn unpackTorBinaries
inputs.dir torBinariesDir
inputs.dir torLibsDir
dependsOn unpackTorBinaries
}