summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2015-08-28 13:54:35 -0700
committerDan Willemsen <dwillemsen@google.com>2015-08-28 13:54:35 -0700
commit6b5cb06eda775ca6ea4da23123d75f1218273978 (patch)
tree2604b3c2f1470d2089f75386de3e8686c064e1ac
parent73f340863693dd5394082251f4fba8ce4f70c2d0 (diff)
downloadandroid_external_zlib-6b5cb06eda775ca6ea4da23123d75f1218273978.tar.gz
android_external_zlib-6b5cb06eda775ca6ea4da23123d75f1218273978.tar.bz2
android_external_zlib-6b5cb06eda775ca6ea4da23123d75f1218273978.zip
Whitelist windows modules
Bug: 23566667 Change-Id: Iee4a18aca8bd68e0527ea6dd977c43e3d4ed239c
-rw-r--r--Android.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 7a3f139..911bfda 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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