summaryrefslogtreecommitdiffstats
path: root/libutils
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-06-05 22:49:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-05 22:49:53 +0000
commit72d77449d99833140f7dd838db6556484031da29 (patch)
tree62cdc70ea2de8341c9e9299a5559c932654da781 /libutils
parentbc28bedaf886e7dc05c7477e78a350f914115074 (diff)
parent4ca26ce8ec3436727a92eb35d1698d2ae540faef (diff)
downloadsystem_core-72d77449d99833140f7dd838db6556484031da29.zip
system_core-72d77449d99833140f7dd838db6556484031da29.tar.gz
system_core-72d77449d99833140f7dd838db6556484031da29.tar.bz2
am 4ca26ce8: Merge "Host multilib build of both 32-bit and 64-bit libraries."
* commit '4ca26ce8ec3436727a92eb35d1698d2ae540faef': Host multilib build of both 32-bit and 64-bit libraries.
Diffstat (limited to 'libutils')
-rw-r--r--libutils/Android.mk1
1 files changed, 1 insertions, 0 deletions
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 @@ endif
LOCAL_MODULE:= libutils
LOCAL_STATIC_LIBRARIES := liblog
LOCAL_CFLAGS += $(host_commonCflags)
+LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY)