summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-06-05 11:10:49 -0700
committerIan Rogers <irogers@google.com>2014-06-05 11:10:49 -0700
commitf3a7284e3890ddabe3116d4b6c81028fb7b524d2 (patch)
tree9db862fd1968a63447cdb18d984ed8dda762e4ab
parenta5c7131da47c991585a6c6ac0c063b6d7d56e3fc (diff)
downloadandroid_external_zlib-f3a7284e3890ddabe3116d4b6c81028fb7b524d2.tar.gz
android_external_zlib-f3a7284e3890ddabe3116d4b6c81028fb7b524d2.tar.bz2
android_external_zlib-f3a7284e3890ddabe3116d4b6c81028fb7b524d2.zip
Build host with multilib both enabled.
Change-Id: Ieb22dec4d3f810efeed93abe2238a75e451e2a06
-rw-r--r--Android.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 3780c89..aff52fb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -50,6 +50,7 @@ LOCAL_MODULE := libz
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -O3 -DUSE_MMAP
LOCAL_SRC_FILES := $(zlib_files)
+LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -60,6 +61,7 @@ LOCAL_MODULE := libz-host
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS += -O3 -DUSE_MMAP
LOCAL_SRC_FILES := $(zlib_files)
+LOCAL_MULTILIB := both
include $(BUILD_HOST_SHARED_LIBRARY)
@@ -75,6 +77,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(zlib_files)
LOCAL_MODULE:= libunz
LOCAL_ARM_MODE := arm
+LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY)
include $(CLEAR_VARS)