diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-09-01 16:37:01 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 16:37:01 +0000 |
| commit | 84363e91550985b80116a906c49fa150743c58b1 (patch) | |
| tree | 2604b3c2f1470d2089f75386de3e8686c064e1ac | |
| parent | d7eb96c5b47d693c40c8c744f77f9c45ac3188b8 (diff) | |
| parent | 316ed876bc5be0f5c67493ae37afc140fe07c0f2 (diff) | |
| download | android_external_zlib-84363e91550985b80116a906c49fa150743c58b1.tar.gz android_external_zlib-84363e91550985b80116a906c49fa150743c58b1.tar.bz2 android_external_zlib-84363e91550985b80116a906c49fa150743c58b1.zip | |
am 316ed876: Merge "Whitelist windows modules"
* commit '316ed876bc5be0f5c67493ae37afc140fe07c0f2':
Whitelist windows modules
| -rw-r--r-- | Android.mk | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -51,18 +51,17 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_ARM_MODE := arm LOCAL_MODULE := libz LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -O3 -DUSE_MMAP LOCAL_SRC_FILES := $(zlib_files) LOCAL_MULTILIB := both LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +LOCAL_MODULE_HOST_OS := darwin linux windows include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_ARM_MODE := arm LOCAL_MODULE := libz-host LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -O3 -DUSE_MMAP |