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 /liblog | |
| 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 'liblog')
| -rw-r--r-- | liblog/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ 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) |