am 85629953: am 3b8de670: Merge "liblog: Build Breakage in sdk(linux)"

* commit '85629953f54603d660f932bebf2c26a009aec380':
  liblog: Build Breakage in sdk(linux)
This commit is contained in:
Mark Salyzyn 2014-03-14 19:26:43 +00:00 committed by Android Git Automerger
commit 92c2beb563
1 changed files with 3 additions and 3 deletions

View File

@ -21,7 +21,6 @@ liblog_sources := logd_write.c
else
liblog_sources := logd_write_kern.c
endif
liblog_sources += log_time.cpp
ifneq ($(filter userdebug eng,$(TARGET_BUILD_VARIANT)),)
liblog_cflags := -DUSERDEBUG_BUILD=1
@ -51,10 +50,11 @@ else
endif
liblog_host_sources := $(liblog_sources) fake_log_device.c
liblog_target_sources := $(liblog_sources) log_time.cpp
ifneq ($(TARGET_USES_LOGD),false)
liblog_target_sources = $(liblog_sources) log_read.c
liblog_target_sources += log_read.c
else
liblog_target_sources = $(liblog_sources) log_read_kern.c
liblog_target_sources += log_read_kern.c
endif
# Shared and static library for host