diff options
| author | Colin Cross <ccross@android.com> | 2014-01-03 18:58:16 -0800 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-01-27 15:13:49 -0800 |
| commit | 11aa6ee98c5cc67e149acb7c634f6c2546678c00 (patch) | |
| tree | ea22a0700d17979f4ee785e4475af1971ca0564c /liblog | |
| parent | f387fa5df0180831abfd2004e78859d66836bc05 (diff) | |
| download | system_core-11aa6ee98c5cc67e149acb7c634f6c2546678c00.tar.gz system_core-11aa6ee98c5cc67e149acb7c634f6c2546678c00.tar.bz2 system_core-11aa6ee98c5cc67e149acb7c634f6c2546678c00.zip | |
liblog: fix build again
log_read.c has to be in the target sources on all platforms, but
never needs to be in the host sources.
(cherry picked from commit 3c37fae4a472835c8e20060e1e6b7495b84f254a)
Change-Id: Ie0829f3f1daf16d151c401653dbef603b1c2f59d
Diffstat (limited to 'liblog')
| -rw-r--r-- | liblog/Android.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/liblog/Android.mk b/liblog/Android.mk index e96f23ae5..78ff1ed6a 100644 --- a/liblog/Android.mk +++ b/liblog/Android.mk @@ -36,17 +36,13 @@ ifndef WITH_MINGW liblog_sources += \ logprint.c \ event_tag_map.c -ifneq ($(HOST_OS),darwin) - liblog_sources += \ - log_read.c -endif else liblog_sources += \ uio.c endif liblog_host_sources := $(liblog_sources) fake_log_device.c - +liblog_target_sources = $(liblog_sources) log_read.c # Shared and static library for host # ======================================================== @@ -76,7 +72,7 @@ include $(BUILD_HOST_STATIC_LIBRARY) # ======================================================== include $(CLEAR_VARS) LOCAL_MODULE := liblog -LOCAL_SRC_FILES := $(liblog_sources) +LOCAL_SRC_FILES := $(liblog_target_sources) include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) |