Merge "Fix the build" (362bdf40) · Commits · e / os / android_system_core

liblog/Android.mk

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -61,7 +61,10 @@ endif
	# ========================================================		# ========================================================
	LOCAL_MODULE := liblog		LOCAL_MODULE := liblog
	LOCAL_SRC_FILES := $(liblog_host_sources)		LOCAL_SRC_FILES := $(liblog_host_sources)
	LOCAL_LDLIBS := -lpthread -lrt		LOCAL_LDLIBS := -lpthread
			ifeq ($(strip $(HOST_OS)),linux)
			LOCAL_LDLIBS += -lrt
			endif
	LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1		LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1
	include $(BUILD_HOST_STATIC_LIBRARY)		include $(BUILD_HOST_STATIC_LIBRARY)

	@@ -77,7 +80,10 @@ include $(BUILD_HOST_SHARED_LIBRARY)
	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_MODULE := lib64log		LOCAL_MODULE := lib64log
	LOCAL_SRC_FILES := $(liblog_host_sources)		LOCAL_SRC_FILES := $(liblog_host_sources)
	LOCAL_LDLIBS := -lpthread -lrt		LOCAL_LDLIBS := -lpthread
			ifeq ($(strip $(HOST_OS)),linux)
			LOCAL_LDLIBS += -lrt
			endif
	LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -m64		LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -m64
	include $(BUILD_HOST_STATIC_LIBRARY)		include $(BUILD_HOST_STATIC_LIBRARY)