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.
This commit is contained in:
Ian Rogers 2014-06-05 22:49:53 +00:00 committed by Android Git Automerger
commit 72d77449d9
3 changed files with 4 additions and 0 deletions

View File

@ -81,6 +81,7 @@ LOCAL_CFLAGS += $(hostSmpFlag)
ifneq ($(HOST_OS),windows)
LOCAL_CFLAGS += -Werror
endif
LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY)

View File

@ -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)

View File

@ -69,6 +69,7 @@ endif
LOCAL_MODULE:= libutils
LOCAL_STATIC_LIBRARIES := liblog
LOCAL_CFLAGS += $(host_commonCflags)
LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY)