commit 0c7ad123cab7a2c81bf90f86b72511a7c6d58d11
author Xavier Ducrohet <xav@google.com> Thu Oct 16 16:55:08 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 16 16:55:08 2014 +0000
tree d03ca35767cf8e193ce0082bf3ca1048dd50a253
parent 5d727710baba8772a8b594f8707455d4b8491948
parent cd1da4e04f0eb71a92a586c66acd0e34115608e1

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

* commit 'cd1da4e04f0eb71a92a586c66acd0e34115608e1':
  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)