summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2014-03-14 14:05:57 -0500
committerMark Salyzyn2014-03-14 14:05:57 -0500
commitc0626fdcaf8e035421939a45c159c0c6a2f2f50a (patch)
tree2584c96ced86c16b65e691117de31ce65140baa1 /liblog/Android.mk
parentfc204a966f953867367f54bda126a2e7d7d98814 (diff)
downloadplatform-system-core-c0626fdcaf8e035421939a45c159c0c6a2f2f50a.tar.gz
platform-system-core-c0626fdcaf8e035421939a45c159c0c6a2f2f50a.tar.xz
platform-system-core-c0626fdcaf8e035421939a45c159c0c6a2f2f50a.zip
liblog: Build Breakage in sdk(linux)
- Build Breakage in branch: aosp-idea133 @ 1072786 Change-Id: I36da253b69a66977ec568a5f96d38b970c25fe3e
Diffstat (limited to 'liblog/Android.mk')
-rw-r--r--liblog/Android.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/liblog/Android.mk b/liblog/Android.mk
index 91f9c341e..54e0b92a0 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -21,7 +21,6 @@ liblog_sources := logd_write.c
21else 21else
22liblog_sources := logd_write_kern.c 22liblog_sources := logd_write_kern.c
23endif 23endif
24liblog_sources += log_time.cpp
25 24
26ifneq ($(filter userdebug eng,$(TARGET_BUILD_VARIANT)),) 25ifneq ($(filter userdebug eng,$(TARGET_BUILD_VARIANT)),)
27liblog_cflags := -DUSERDEBUG_BUILD=1 26liblog_cflags := -DUSERDEBUG_BUILD=1
@@ -51,10 +50,11 @@ else
51endif 50endif
52 51
53liblog_host_sources := $(liblog_sources) fake_log_device.c 52liblog_host_sources := $(liblog_sources) fake_log_device.c
53liblog_target_sources := $(liblog_sources) log_time.cpp
54ifneq ($(TARGET_USES_LOGD),false) 54ifneq ($(TARGET_USES_LOGD),false)
55liblog_target_sources = $(liblog_sources) log_read.c 55liblog_target_sources += log_read.c
56else 56else
57liblog_target_sources = $(liblog_sources) log_read_kern.c 57liblog_target_sources += log_read_kern.c
58endif 58endif
59 59
60# Shared and static library for host 60# Shared and static library for host