From de939d7c9266f89542cea5ebef5980a95f1244a9 Mon Sep 17 00:00:00 2001

From: Mikolaj Izdebski <mizdebsk@redhat.com>

Date: Mon, 10 Jul 2017 11:48:43 +0200

Subject: [PATCH 5/6] Fix duplicate manifest entry

Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1469022

---

 build.xml | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml

index d1fe4aa..c0a0b78 100644

--- a/build.xml

+++ b/build.xml

@@ -571,9 +571,9 @@ osname=macosx;processor=x86;processor=x86-64;processor=ppc

                   includes="*jnidispatch*"

                   prefix="com/sun/jna/w32ce-arm"/>

     </jar>

-    <zip zipfile="${build}/${minjar}">

+    <jar zipfile="${build}/${minjar}" filesetmanifest="merge">

       <zipfileset src="${build}/${jar}" excludes="**/*jnidispatch*"/>

-    </zip>

+    </jar>

   </target>

   <target name="aar" depends="jar" description="Build Android Archive">

-- 

2.14.3