commit bd3a8c6801a3d94e04d3d6049d348b7355a792b5
author Xavier Ducrohet <xav@google.com> Thu Oct 16 19:17:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 16 19:17:21 2014 +0000
tree 1e4584000c2287dee1790c3cdb00f6df11fb494e
parent aee1405ac8988d1477ee86e730cd54cf0d356ce0
parent 8afb7d73baa369d0f43d85b1a1894cdd8cd243db

am 8afb7d73: am 66fa33a7: am dc7957d9: am cd1da4e0: Fix toolchain issue for windows build of libziparchive.

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

libziparchive/Android.mk

diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk
index d96bc63..0333750 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)