Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1165cf4f authored Jun 05, 2014 by Ian Rogers Committed by Android Git Automerger Jun 05, 2014

am 928821bd: am 72d77449: am 4ca26ce8: Merge "Host multilib build of both...

am 928821bd: am 72d77449: am 4ca26ce8: Merge "Host multilib build of both 32-bit and 64-bit libraries."

* commit '928821bd':
  Host multilib build of both 32-bit and 64-bit libraries.

parents fc5f049c 928821bd

libcutils/Android.mk

+1 −0

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

liblog/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -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)

libutils/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ endif
		LOCAL_MODULE:= libutils
		LOCAL_STATIC_LIBRARIES := liblog
		LOCAL_CFLAGS += $(host_commonCflags)
		LOCAL_MULTILIB := both
		include $(BUILD_HOST_STATIC_LIBRARY)