Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
579
Issues
579
List
Boards
Labels
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
briar
briar
Commits
2b589c2d
Commit
2b589c2d
authored
Oct 14, 2019
by
akwizgran
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'tor64' into 'master'
Add support for 64-bit Tor binaries Closes
#1506
See merge request
!1161
parents
67d15ec8
7a0d990f
Pipeline
#3775
passed with stage
in 8 minutes and 26 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
5 deletions
+13
-5
build.gradle
bramble-android/build.gradle
+4
-2
AndroidTorPluginFactory.java
...arproject/bramble/plugin/tor/AndroidTorPluginFactory.java
+7
-1
witness.gradle
bramble-android/witness.gradle
+2
-2
No files found.
bramble-android/build.gradle
View file @
2b589c2d
...
...
@@ -30,8 +30,8 @@ configurations {
dependencies
{
implementation
project
(
path:
':bramble-core'
,
configuration:
'default'
)
tor
'org.briarproject:tor-android:0.3.5.8@zip'
tor
'org.briarproject:obfs4proxy-android:0.0.
9
@zip'
tor
'org.briarproject:tor-android:0.3.5.8
-64
@zip'
tor
'org.briarproject:obfs4proxy-android:0.0.
11-2
@zip'
annotationProcessor
'com.google.dagger:dagger-compiler:2.22.1'
...
...
@@ -59,6 +59,8 @@ task unpackTorBinaries {
copy
{
from
configurations
.
tor
.
collect
{
zipTree
(
it
)
}
into
torBinariesDir
// TODO: Remove after next Tor upgrade, which won't include non-PIE binaries
include
'geoip.zip'
,
'*_pie.zip'
}
}
dependsOn
cleanTorBinaries
...
...
bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/AndroidTorPluginFactory.java
View file @
2b589c2d
...
...
@@ -88,9 +88,15 @@ public class AndroidTorPluginFactory implements DuplexPluginFactory {
// Check that we have a Tor binary for this architecture
String
architecture
=
null
;
for
(
String
abi
:
AndroidUtils
.
getSupportedArchitectures
())
{
if
(
abi
.
startsWith
(
"x86"
))
{
if
(
abi
.
startsWith
(
"x86_64"
))
{
architecture
=
"x86_64"
;
break
;
}
else
if
(
abi
.
startsWith
(
"x86"
))
{
architecture
=
"x86"
;
break
;
}
else
if
(
abi
.
startsWith
(
"arm64"
))
{
architecture
=
"arm64"
;
break
;
}
else
if
(
abi
.
startsWith
(
"armeabi"
))
{
architecture
=
"arm"
;
break
;
...
...
bramble-android/witness.gradle
View file @
2b589c2d
...
...
@@ -66,8 +66,8 @@ dependencyVerification {
'org.beanshell:bsh:1.3.0:bsh-1.3.0.jar:9b04edc75d19db54f1b4e8b5355e9364384c6cf71eb0a1b9724c159d779879f8'
,
'org.bouncycastle:bcpkix-jdk15on:1.56:bcpkix-jdk15on-1.56.jar:7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca'
,
'org.bouncycastle:bcprov-jdk15on:1.56:bcprov-jdk15on-1.56.jar:963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349'
,
'org.briarproject:obfs4proxy-android:0.0.
9:obfs4proxy-android-0.0.9.zip:9b7e9181535ea8d8bbe8ae6338e08cf4c5fc1e357a779393e0ce49586d459ae0
'
,
'org.briarproject:tor-android:0.3.5.8
:tor-android-0.3.5.8.zip:42a13a6f185be1a62f42e3f30ce66a3c099ac5ec890a65e7593111b65b44a54a
'
,
'org.briarproject:obfs4proxy-android:0.0.
11-2:obfs4proxy-android-0.0.11-2.zip:57e55cbe87aa2aac210fdbb6cd8cdeafe15f825406a08ebf77a8b787aa2c6a8a
'
,
'org.briarproject:tor-android:0.3.5.8
-64:tor-android-0.3.5.8-64.zip:9f144088c0fe845d1cf3232cdc2b51c68e6f9a22660592009f43a5633fca8824
'
,
'org.checkerframework:checker-compat-qual:2.5.3:checker-compat-qual-2.5.3.jar:d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d'
,
'org.checkerframework:checker-qual:2.5.2:checker-qual-2.5.2.jar:64b02691c8b9d4e7700f8ee2e742dce7ea2c6e81e662b7522c9ee3bf568c040a'
,
'org.codehaus.groovy:groovy-all:2.4.15:groovy-all-2.4.15.jar:51d6c4e71782e85674239189499854359d380fb75e1a703756e3aaa5b98a5af0'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment