diff options
author | Mark Salyzyn | 2014-03-14 14:05:57 -0500 |
---|---|---|
committer | Mark Salyzyn | 2014-03-14 14:05:57 -0500 |
commit | c0626fdcaf8e035421939a45c159c0c6a2f2f50a (patch) | |
tree | 2584c96ced86c16b65e691117de31ce65140baa1 /liblog | |
parent | fc204a966f953867367f54bda126a2e7d7d98814 (diff) | |
download | platform-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')
-rw-r--r-- | liblog/Android.mk | 6 |
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 | |||
21 | else | 21 | else |
22 | liblog_sources := logd_write_kern.c | 22 | liblog_sources := logd_write_kern.c |
23 | endif | 23 | endif |
24 | liblog_sources += log_time.cpp | ||
25 | 24 | ||
26 | ifneq ($(filter userdebug eng,$(TARGET_BUILD_VARIANT)),) | 25 | ifneq ($(filter userdebug eng,$(TARGET_BUILD_VARIANT)),) |
27 | liblog_cflags := -DUSERDEBUG_BUILD=1 | 26 | liblog_cflags := -DUSERDEBUG_BUILD=1 |
@@ -51,10 +50,11 @@ else | |||
51 | endif | 50 | endif |
52 | 51 | ||
53 | liblog_host_sources := $(liblog_sources) fake_log_device.c | 52 | liblog_host_sources := $(liblog_sources) fake_log_device.c |
53 | liblog_target_sources := $(liblog_sources) log_time.cpp | ||
54 | ifneq ($(TARGET_USES_LOGD),false) | 54 | ifneq ($(TARGET_USES_LOGD),false) |
55 | liblog_target_sources = $(liblog_sources) log_read.c | 55 | liblog_target_sources += log_read.c |
56 | else | 56 | else |
57 | liblog_target_sources = $(liblog_sources) log_read_kern.c | 57 | liblog_target_sources += log_read_kern.c |
58 | endif | 58 | endif |
59 | 59 | ||
60 | # Shared and static library for host | 60 | # Shared and static library for host |