mirror of
https://github.com/KDE/kdeconnect-android
synced 2025-08-28 20:57:42 +00:00
Remove directives that aren't needed
And changed pickFirst to merge, that concatenates the contents
This commit is contained in:
parent
a918f0cfe6
commit
7dc023385e
@ -36,12 +36,9 @@ android {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
packagingOptions {
|
packagingOptions {
|
||||||
pickFirst "META-INF/DEPENDENCIES"
|
merge "META-INF/DEPENDENCIES"
|
||||||
pickFirst "META-INF/LICENSE"
|
merge "META-INF/LICENSE"
|
||||||
pickFirst "META-INF/NOTICE"
|
merge "META-INF/NOTICE"
|
||||||
pickFirst "META-INF/BCKEY.SF"
|
|
||||||
pickFirst "META-INF/BCKEY.DSA"
|
|
||||||
pickFirst "META-INF/INDEX.LIST"
|
|
||||||
}
|
}
|
||||||
lintOptions {
|
lintOptions {
|
||||||
abortOnError false
|
abortOnError false
|
||||||
|
Loading…
x
Reference in New Issue
Block a user