diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-10-16 19:11:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-16 19:11:45 +0000 |
| commit | 8afb7d73baa369d0f43d85b1a1894cdd8cd243db (patch) | |
| tree | e17765aee742cfe2ad89977055255df922dc943a | |
| parent | 495c1c9d2f5871f55647acaa3d99d01612867777 (diff) | |
| parent | 66fa33a7adf38e513825d36e98b7cdf2c225d2b4 (diff) | |
| download | system_core-8afb7d73baa369d0f43d85b1a1894cdd8cd243db.zip system_core-8afb7d73baa369d0f43d85b1a1894cdd8cd243db.tar.gz system_core-8afb7d73baa369d0f43d85b1a1894cdd8cd243db.tar.bz2 | |
am 66fa33a7: am dc7957d9: am cd1da4e0: Fix toolchain issue for windows build of libziparchive.
* commit '66fa33a7adf38e513825d36e98b7cdf2c225d2b4':
Fix toolchain issue for windows build of libziparchive.
| -rw-r--r-- | libziparchive/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
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_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) |