From cd1da4e04f0eb71a92a586c66acd0e34115608e1 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@google.com>
Date: Wed, 15 Oct 2014 23:38:17 -0700
Subject: Fix toolchain issue for windows build of libziparchive.

With mingw 4.8, the new default packed behavior is broken and makes
zip archive fails due to unexpected misalignment in
CentralDirectoryRecord.

This patch uses -mno-ms-bitfields to revert to the old packed
behavior.

Change-Id: Ic977c841e330e19451db1d31ddb22e570a525062
---
 libziparchive/Android.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk
index 705caa5..d23a94f 100644
--- a/libziparchive/Android.mk
+++ b/libziparchive/Android.mk
@@ -42,6 +42,9 @@ LOCAL_C_INCLUDES += ${includes}
 LOCAL_STATIC_LIBRARIES := libz libutils
 LOCAL_MODULE:= libziparchive-host
 LOCAL_CFLAGS := -Werror
+ifneq ($(strip $(USE_MINGW)),)
+	LOCAL_CFLAGS += -mno-ms-bitfields
+endif
 LOCAL_MULTILIB := both
 include $(BUILD_HOST_STATIC_LIBRARY)
 
-- 
cgit v1.1