From 7dc023385ef3638ed2190bfd532bb1fe8af4b18b Mon Sep 17 00:00:00 2001 From: Albert Vaca Cintora Date: Thu, 21 Mar 2019 09:49:49 +0100 Subject: [PATCH] Remove directives that aren't needed And changed pickFirst to merge, that concatenates the contents --- build.gradle | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 237bcf4f..1c22fd0f 100644 --- a/build.gradle +++ b/build.gradle @@ -36,12 +36,9 @@ android { } } packagingOptions { - pickFirst "META-INF/DEPENDENCIES" - pickFirst "META-INF/LICENSE" - pickFirst "META-INF/NOTICE" - pickFirst "META-INF/BCKEY.SF" - pickFirst "META-INF/BCKEY.DSA" - pickFirst "META-INF/INDEX.LIST" + merge "META-INF/DEPENDENCIES" + merge "META-INF/LICENSE" + merge "META-INF/NOTICE" } lintOptions { abortOnError false