summaryrefslogtreecommitdiffstats
path: root/libcutils
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-06-05 23:00:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-05 23:00:09 +0000
commit1165cf4f443bdc347485b19f8c6902ba1b5f2466 (patch)
tree8d57669105b1a288217335fe6c2b9cf2912067fb /libcutils
parentfc5f049c5c0463673f970af726c58fddc88780bb (diff)
parent928821bd123aa38094289b9c62debb4d92b84069 (diff)
downloadsystem_core-1165cf4f443bdc347485b19f8c6902ba1b5f2466.zip
system_core-1165cf4f443bdc347485b19f8c6902ba1b5f2466.tar.gz
system_core-1165cf4f443bdc347485b19f8c6902ba1b5f2466.tar.bz2
am 928821bd: am 72d77449: am 4ca26ce8: Merge "Host multilib build of both 32-bit and 64-bit libraries."
* commit '928821bd123aa38094289b9c62debb4d92b84069': Host multilib build of both 32-bit and 64-bit libraries.
Diffstat (limited to 'libcutils')
-rw-r--r--libcutils/Android.mk1
1 files changed, 1 insertions, 0 deletions
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 @@ LOCAL_CFLAGS += $(hostSmpFlag)
ifneq ($(HOST_OS),windows)
LOCAL_CFLAGS += -Werror
endif
+LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY)