commit 3890c01f85284311ec337fcc2c347490b5abff1f
author Mark Salyzyn <salyzyn@google.com> Fri Mar 14 19:25:16 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 14 19:25:16 2014 +0000
tree d26536d01122e8e72c49c7754848511567d1b39e
parent a0f97dc804d19d176a1856a9abce07e3ea2b627c
parent 3b8de6705bb5c77b6f459fd6dd394ef606228a05

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

* commit '3b8de6705bb5c77b6f459fd6dd394ef606228a05':
  liblog: Build Breakage in sdk(linux)

liblog/Android.mk

diff --git a/liblog/Android.mk b/liblog/Android.mk
index 91f9c34..54e0b92 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -21,7 +21,6 @@
 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 @@
 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