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

Merge branch '123-encrypted-crash-reports' into 'master'

Browse Source 
Encrypted crash reports

Part of #123.

See merge request !128
This commit is contained in:
akwizgran
2016-04-25 10:17:53 +00:00
parent 5457588dbd 9b5d3ecb7a
commit 1b08720200
24 changed files with 715 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-android/build.gradle
View File

@@ -16,6 +16,9 @@ dependencies {
compile project(':briar-api')
compile project(':briar-core')
compile fileTree(dir: 'libs', include: '*.jar')
// This shouldn't be necessary; per section 23.4.4 of the Gradle docs:
// "file dependencies are included in transitive project dependencies within the same build".
compile files('../briar-core/libs/jsocks.jar')
compile "com.android.support:support-v4:$supportVersion"
compile("com.android.support:appcompat-v7:$supportVersion") {
exclude module: 'support-v4'