diff options
author | Ian Rogers <irogers@google.com> | 2014-06-05 23:00:09 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-05 23:00:09 +0000 |
commit | 1165cf4f443bdc347485b19f8c6902ba1b5f2466 (patch) | |
tree | 8d57669105b1a288217335fe6c2b9cf2912067fb /libutils | |
parent | fc5f049c5c0463673f970af726c58fddc88780bb (diff) | |
parent | 928821bd123aa38094289b9c62debb4d92b84069 (diff) | |
download | system_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 'libutils')
-rw-r--r-- | libutils/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libutils/Android.mk b/libutils/Android.mk index 8ff0884..9343f8e 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk @@ -70,6 +70,7 @@ endif LOCAL_MODULE:= libutils LOCAL_STATIC_LIBRARIES := liblog LOCAL_CFLAGS += $(host_commonCflags) +LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) |