diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-03-14 19:18:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-14 19:18:23 +0000 |
| commit | 3b8de6705bb5c77b6f459fd6dd394ef606228a05 (patch) | |
| tree | 2584c96ced86c16b65e691117de31ce65140baa1 | |
| parent | fc204a966f953867367f54bda126a2e7d7d98814 (diff) | |
| parent | c0626fdcaf8e035421939a45c159c0c6a2f2f50a (diff) | |
| download | system_core-3b8de6705bb5c77b6f459fd6dd394ef606228a05.zip system_core-3b8de6705bb5c77b6f459fd6dd394ef606228a05.tar.gz system_core-3b8de6705bb5c77b6f459fd6dd394ef606228a05.tar.bz2 | |
Merge "liblog: Build Breakage in sdk(linux)"
| -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 91f9c34..54e0b92 100644 --- a/liblog/Android.mk +++ b/liblog/Android.mk @@ -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 |