am 92c2beb5: am 85629953: am 3b8de670: Merge "liblog: Build Breakage in sdk(linux)" (8e45a18a) · Commits · e / os / android_system_core

liblog/Android.mk

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -21,7 +21,6 @@ liblog_sources := logd_write.c
	else		else
	liblog_sources := logd_write_kern.c		liblog_sources := logd_write_kern.c
	endif		endif
	liblog_sources += log_time.cpp

	ifneq ($(filter userdebug eng,$(TARGET_BUILD_VARIANT)),)		ifneq ($(filter userdebug eng,$(TARGET_BUILD_VARIANT)),)
	liblog_cflags := -DUSERDEBUG_BUILD=1		liblog_cflags := -DUSERDEBUG_BUILD=1
	@@ -51,10 +50,11 @@ else
	endif		endif

	liblog_host_sources := $(liblog_sources) fake_log_device.c		liblog_host_sources := $(liblog_sources) fake_log_device.c
			liblog_target_sources := $(liblog_sources) log_time.cpp
	ifneq ($(TARGET_USES_LOGD),false)		ifneq ($(TARGET_USES_LOGD),false)
	liblog_target_sources = $(liblog_sources) log_read.c		liblog_target_sources += log_read.c
	else		else
	liblog_target_sources = $(liblog_sources) log_read_kern.c		liblog_target_sources += log_read_kern.c
	endif		endif

	# Shared and static library for host		# Shared and static library for host