From 59ec765382d800e84662f7b196b5bd053157b71a Mon Sep 17 00:00:00 2001
From: Ian Rogers <irogers@google.com>
Date: Thu, 5 Jun 2014 14:32:49 -0700
Subject: [PATCH] Host multilib build of both 32-bit and 64-bit libraries.

Change-Id: I54f91f385b109fc664a1a1f9320affb2a846fef1
---
 libcutils/Android.mk | 1 +
 liblog/Android.mk    | 2 ++
 libutils/Android.mk  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 20ad7eadb..ca1fd15a3 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -81,6 +81,7 @@ LOCAL_CFLAGS += $(hostSmpFlag)
 ifneq ($(HOST_OS),windows)
 LOCAL_CFLAGS += -Werror
 endif
+LOCAL_MULTILIB := both
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 
diff --git a/liblog/Android.mk b/liblog/Android.mk
index 69ca4164f..a7eead974 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -58,6 +58,7 @@ endif
 LOCAL_MODULE := liblog
 LOCAL_SRC_FILES := $(liblog_host_sources)
 LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -Werror
+LOCAL_MULTILIB := both
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -66,6 +67,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := liblog
 ifeq ($(strip $(HOST_OS)),linux)
 LOCAL_LDLIBS := -lrt
 endif
+LOCAL_MULTILIB := both
 include $(BUILD_HOST_SHARED_LIBRARY)
 
 
diff --git a/libutils/Android.mk b/libutils/Android.mk
index 3afc1ec4b..9a50147e3 100644
--- a/libutils/Android.mk
+++ b/libutils/Android.mk
@@ -69,6 +69,7 @@ endif
 LOCAL_MODULE:= libutils
 LOCAL_STATIC_LIBRARIES := liblog
 LOCAL_CFLAGS += $(host_commonCflags)
+LOCAL_MULTILIB := both
 include $(BUILD_HOST_STATIC_LIBRARY)