ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Host multilib build of both 32-bit and 64-bit libraries."

Browse source
This commit is contained in:
Ian Rogers 2014-06-05 22:38:14 +00:00 • committed by Gerrit Code Review
commit 4ca26ce8ec
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libcutils/Android.mk
View file

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

2
liblog/Android.mk
View file

@ -58,6 +58,7 @@ endif
LOCAL_MODULE := liblog LOCAL_MODULE := liblog
LOCAL_SRC_FILES := $(liblog_host_sources) LOCAL_SRC_FILES := $(liblog_host_sources)
LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -Werror LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -Werror
LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -66,6 +67,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := liblog
ifeq ($(strip $(HOST_OS)),linux) ifeq ($(strip $(HOST_OS)),linux)
LOCAL_LDLIBS := -lrt LOCAL_LDLIBS := -lrt
endif endif
LOCAL_MULTILIB := both
include $(BUILD_HOST_SHARED_LIBRARY) include $(BUILD_HOST_SHARED_LIBRARY)

1
libutils/Android.mk
View file

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