commit 66fa33a7adf38e513825d36e98b7cdf2c225d2b4
author Xavier Ducrohet <xav@google.com> Thu Oct 16 18:59:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 16 18:59:54 2014 +0000
tree 95181f60312accb548a032c3aa1fac32607767e5
parent 1a27d6ab328676bf648da74fe78836e7c1ffc8e2
parent dc7957d9b782a759a4eaa75832dd18c9943c7d0c

am dc7957d9: am cd1da4e0: Fix toolchain issue for windows build of libziparchive.

* commit 'dc7957d9b782a759a4eaa75832dd18c9943c7d0c':
  Fix toolchain issue for windows build of libziparchive.

libziparchive/Android.mk

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_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)