diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-08-13 14:43:34 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2015-09-02 17:10:35 -0700 |
| commit | 87a419c8b1343c9025fe2593206a6e95b0aa9700 (patch) | |
| tree | ebe871c66424c8f9d7d205f686b6cd681cb856ec /libziparchive | |
| parent | 03bbd64aa99bb03bf80a9340750afa96bdb34280 (diff) | |
| download | system_core-87a419c8b1343c9025fe2593206a6e95b0aa9700.tar.gz system_core-87a419c8b1343c9025fe2593206a6e95b0aa9700.tar.bz2 system_core-87a419c8b1343c9025fe2593206a6e95b0aa9700.zip | |
Remove USE_MINGW/CYGWIN; Whitelist windows modules
CYGWIN is not supported, USE_MINGW and HOST_OS==windows are being
replaced with LOCAL_..._windows variables.
Bug: 23566667
Change-Id: I3e4a1e4097dc994cf5abdce6939e83a91758fd75
Diffstat (limited to 'libziparchive')
| -rw-r--r-- | libziparchive/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libziparchive/Android.mk b/libziparchive/Android.mk index 559c48bb3..608ff1cc0 100644 --- a/libziparchive/Android.mk +++ b/libziparchive/Android.mk @@ -33,10 +33,9 @@ LOCAL_SRC_FILES := ${source_files} LOCAL_STATIC_LIBRARIES := libz libutils libbase LOCAL_MODULE:= libziparchive-host LOCAL_CFLAGS := -Werror -ifneq ($(strip $(USE_MINGW)),) - LOCAL_CFLAGS += -mno-ms-bitfields -endif +LOCAL_CFLAGS_windows := -mno-ms-bitfields LOCAL_MULTILIB := both +LOCAL_MODULE_HOST_OS := darwin linux windows include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) |