commit 4ca26ce8ec3436727a92eb35d1698d2ae540faef
author Ian Rogers <irogers@google.com> Thu Jun 05 22:38:14 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 05 22:38:15 2014 +0000
tree 6bcee695e7494794923a40e4a4b3373f47c77311
parent e0115dd1302f6156879938dfb8bcc9ac5a43d7a6
parent 59ec765382d800e84662f7b196b5bd053157b71a

Merge "Host multilib build of both 32-bit and 64-bit libraries."

libcutils/Android.mk

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 20ad7ea..ca1fd15 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -81,6 +81,7 @@
 ifneq ($(HOST_OS),windows)
 LOCAL_CFLAGS += -Werror
 endif
+LOCAL_MULTILIB := both
 include $(BUILD_HOST_STATIC_LIBRARY)
 
 

liblog/Android.mk

diff --git a/liblog/Android.mk b/liblog/Android.mk
index 69ca416..a7eead9 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -58,6 +58,7 @@
 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 @@
 ifeq ($(strip $(HOST_OS)),linux)
 LOCAL_LDLIBS := -lrt
 endif
+LOCAL_MULTILIB := both
 include $(BUILD_HOST_SHARED_LIBRARY)
 
 

libutils/Android.mk

diff --git a/libutils/Android.mk b/libutils/Android.mk
index 3afc1ec..9a50147 100644
--- a/libutils/Android.mk
+++ b/libutils/Android.mk
@@ -69,6 +69,7 @@
 LOCAL_MODULE:= libutils
 LOCAL_STATIC_LIBRARIES := liblog
 LOCAL_CFLAGS += $(host_commonCflags)
+LOCAL_MULTILIB := both
 include $(BUILD_HOST_STATIC_LIBRARY)