From ef6cbb7abbe31d32b99fd410b7171bd052c0f260 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Wed, 13 Apr 2016 22:12:44 +0200 Subject: [PATCH] K-9 Mail: Fix build --- metadata/com.fsck.k9.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/metadata/com.fsck.k9.txt b/metadata/com.fsck.k9.txt index fdc3ddb11c..fb838faf4e 100644 --- a/metadata/com.fsck.k9.txt +++ b/metadata/com.fsck.k9.txt @@ -189,16 +189,15 @@ Build:5.009,22009 popd Build:5.010,22010 - disable=binaries commit=5.010 gradle=yes srclibs=Jutf7@20 rm=libs/* - prebuild=sed -i -e "/buildToolsVersion/adefaultConfig {\ntargetSdkVersion 17\n}\n\npackagingOptions {\n exclude 'META-INF/LICENSE.txt'\n exclude 'META-INF/NOTICE.txt'\n}" -e "/com.android.application/arepositories {\n mavenCentral()\n mavenLocal()\n}" -e "/fileTree/acompile 'net.sourceforge.htmlcleaner:htmlcleaner:2.2'" -e "/fileTree/acompile 'org.apache.james:apache-mime4j-core:0.7.2'" -e "/fileTree/acompile 'org.apache.james:apache-mime4j-dom:0.7.2'" -e "/fileTree/acompile 'com.jcraft:jzlib:1.0.7'" -e "/fileTree/acompile 'com.beetstra.jutf7:jutf7:1.0.1-SNAPSHOT'" -e "/fileTree/acompile 'commons-io:commons-io:2.0.1'" build.gradle && \ + prebuild=sed -i -e "/buildToolsVersion/adefaultConfig {\ntargetSdkVersion 17\n}\n\npackagingOptions {\n exclude 'META-INF/LICENSE.txt'\n exclude 'META-INF/NOTICE.txt'\n}" -e "/com.android.application/arepositories {\n mavenCentral()\n mavenLocal()\n}" -e "/fileTree/acompile 'net.sourceforge.htmlcleaner:htmlcleaner:2.2'" -e "/fileTree/acompile 'org.apache.james:apache-mime4j-core:0.7.2'" -e "/fileTree/acompile 'org.apache.james:apache-mime4j-dom:0.7.2'" -e "/fileTree/acompile 'com.jcraft:jzlib:1.0.7'" -e "/fileTree/acompile 'com.beetstra.jutf7:jutf7:1.0.1-SNAPSHOT'" -e "/fileTree/acompile 'commons-io:commons-io:2.0.1'" -e "/filetree/acompile 'de.cketti.safecontentresolver:safe-content-resolver-v14:0.0.1'" build.gradle && \ pushd $$Jutf7$$ && \ $$MVN3$$ install && \ popd - scanignore=plugins/SafeContentResolver/* + scandelete=plugins/SafeContentResolver/* Maintainer Notes: * Force targetSdk via gradle, to avoid erroneous call_log