commit 8d977782c1cfe9d75cc9a464439c2ff1e27e1665
author Ian Rogers <irogers@google.com> Thu Jun 05 18:40:27 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 05 18:40:27 2014 +0000
tree 9db862fd1968a63447cdb18d984ed8dda762e4ab
parent a5c7131da47c991585a6c6ac0c063b6d7d56e3fc
parent f3a7284e3890ddabe3116d4b6c81028fb7b524d2

Merge "Build host with multilib both enabled."

Android.mk

diff --git a/Android.mk b/Android.mk
index 3780c89..aff52fb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -50,6 +50,7 @@
 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_TAGS := optional
 LOCAL_CFLAGS += -O3 -DUSE_MMAP
 LOCAL_SRC_FILES := $(zlib_files)
+LOCAL_MULTILIB := both
 include $(BUILD_HOST_SHARED_LIBRARY)
 
 
@@ -75,6 +77,7 @@
 LOCAL_SRC_FILES := $(zlib_files)
 LOCAL_MODULE:= libunz
 LOCAL_ARM_MODE := arm
+LOCAL_MULTILIB := both
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)