mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-13 20:35:10 -05:00
Add safeslinger to build
This commit is contained in:
parent
dece50244b
commit
10e96dff43
@ -20,11 +20,12 @@ dependencies {
|
|||||||
compile project(':extern:KeybaseLib:Lib')
|
compile project(':extern:KeybaseLib:Lib')
|
||||||
compile project(':extern:TokenAutoComplete:library')
|
compile project(':extern:TokenAutoComplete:library')
|
||||||
compile project(':extern:openpgp-card-nfc-lib:library')
|
compile project(':extern:openpgp-card-nfc-lib:library')
|
||||||
|
compile project(':extern:safeslinger-exchange')
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 19
|
compileSdkVersion 19
|
||||||
buildToolsVersion "19.1"
|
buildToolsVersion '19.1'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 9
|
minSdkVersion 9
|
||||||
@ -67,7 +68,7 @@ android {
|
|||||||
|
|
||||||
checkAllWarnings true
|
checkAllWarnings true
|
||||||
htmlReport true
|
htmlReport true
|
||||||
htmlOutput file("lint-report.html")
|
htmlOutput file('lint-report.html')
|
||||||
}
|
}
|
||||||
|
|
||||||
// Disable preDexing, causes com.android.dx.cf.iface.ParseException: bad class file magic (cafebabe) or version (0034.0000) on some systems
|
// Disable preDexing, causes com.android.dx.cf.iface.ParseException: bad class file magic (cafebabe) or version (0034.0000) on some systems
|
||||||
@ -78,7 +79,7 @@ android {
|
|||||||
|
|
||||||
// NOTE: This disables Lint!
|
// NOTE: This disables Lint!
|
||||||
tasks.whenTaskAdded { task ->
|
tasks.whenTaskAdded { task ->
|
||||||
if (task.name.contains("lint")) {
|
if (task.name.contains('lint')) {
|
||||||
task.enabled = false
|
task.enabled = false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -54,6 +54,7 @@
|
|||||||
<uses-permission android:name="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" />
|
<uses-permission android:name="org.sufficientlysecure.keychain.WRITE_TEMPORARY_STORAGE" />
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||||
<uses-permission android:name="android.permission.NFC" />
|
<uses-permission android:name="android.permission.NFC" />
|
||||||
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
|
||||||
|
2
extern/safeslinger-exchange
vendored
2
extern/safeslinger-exchange
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 7e10175f2f7560d777b93fbf365a547191dd4061
|
Subproject commit b0f7e0af9b19e63032ce2452b6ca27285a72793e
|
@ -14,3 +14,4 @@ include ':extern:minidns'
|
|||||||
include ':extern:KeybaseLib:Lib'
|
include ':extern:KeybaseLib:Lib'
|
||||||
include ':extern:TokenAutoComplete:library'
|
include ':extern:TokenAutoComplete:library'
|
||||||
include ':extern:openpgp-card-nfc-lib:library'
|
include ':extern:openpgp-card-nfc-lib:library'
|
||||||
|
include ':extern:safeslinger-exchange'
|
Loading…
Reference in New Issue
Block a user