commit 37ef356a8e4577b289ade868900e15c82c0ad57f
author Dmitriy Ivanov <dimitry@google.com> Mon Oct 20 16:39:56 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 20 16:39:57 2014 +0000
tree 8ac68c592c4f0215ef17c472b0ea52788fd7ffbf
parent 81080625a239ae953ef355974e1da7d50389fbb6
parent 976e1b64314d5e0f86221fdc2fb62605a9447ca7

Merge "Remove libsigchain from LD_PRELOADs" into lmp-mr1-dev

libutils/FileMap.cpp

diff --git a/libutils/FileMap.cpp b/libutils/FileMap.cpp
index be4b14f..f8d6bda 100644
--- a/libutils/FileMap.cpp
+++ b/libutils/FileMap.cpp
@@ -77,7 +77,6 @@
     if (mFileMapping != INVALID_HANDLE_VALUE) {
         CloseHandle(mFileMapping);
     }
-    CloseHandle(mFileHandle);
 #endif
 }
 

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)