Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-21 07:09:56 +01:00
Code Issues Projects Releases Wiki Activity

Always unpack and include latest Tor binaries.

Browse Source
This commit is contained in:
akwizgran
2018-11-08 17:48:26 +00:00
parent 50cc0a6815
commit 5ede63edd5
2 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
bramble-android/build.gradle
View File

@@ -1,3 +1,5 @@
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'
@@ -44,20 +46,6 @@ dependencies {
def torBinariesDir = 'src/main/res/raw' def torBinariesDir = 'src/main/res/raw'
task unpackTorBinaries {
outputs.dir torBinariesDir
doLast {
copy {
from configurations.tor.collect { zipTree(it) }
into torBinariesDir
}
}
}
tasks.withType(JavaCompile) {
dependsOn unpackTorBinaries
}
task cleanTorBinaries { task cleanTorBinaries {
doLast { doLast {
delete fileTree(torBinariesDir) { include '*.zip' } delete fileTree(torBinariesDir) { include '*.zip' }
@@ -65,3 +53,18 @@ task cleanTorBinaries {
} }
clean.dependsOn cleanTorBinaries clean.dependsOn cleanTorBinaries
task unpackTorBinaries {
doLast {
copy {
from configurations.tor.collect { zipTree(it) }
into torBinariesDir
}
}
dependsOn cleanTorBinaries
}
tasks.withType(MergeResources) {
inputs.dir torBinariesDir
dependsOn unpackTorBinaries
}

29
bramble-java/build.gradle
View File

@@ -33,20 +33,6 @@ dependencies {
def torBinariesDir = 'src/main/resources' def torBinariesDir = 'src/main/resources'
task unpackTorBinaries {
outputs.dir torBinariesDir
doLast {
copy {
from configurations.tor.collect { zipTree(it) }
into torBinariesDir
}
}
}
tasks.withType(JavaCompile) {
dependsOn unpackTorBinaries
}
task cleanTorBinaries { task cleanTorBinaries {
doLast { doLast {
delete fileTree(torBinariesDir) { include '*.zip' } delete fileTree(torBinariesDir) { include '*.zip' }
@@ -55,6 +41,21 @@ task cleanTorBinaries {
clean.dependsOn cleanTorBinaries clean.dependsOn cleanTorBinaries
task unpackTorBinaries {
doLast {
copy {
from configurations.tor.collect { zipTree(it) }
into torBinariesDir
}
}
dependsOn cleanTorBinaries
}
processResources {
inputs.dir torBinariesDir
dependsOn unpackTorBinaries
}
tasks.withType(Test) { tasks.withType(Test) {
systemProperty 'java.library.path', 'libs' systemProperty 'java.library.path', 'libs'
} }