summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross2014-01-03 20:58:16 -0600
committerMark Salyzyn2014-01-27 17:13:49 -0600
commit11aa6ee98c5cc67e149acb7c634f6c2546678c00 (patch)
treeea22a0700d17979f4ee785e4475af1971ca0564c /liblog/Android.mk
parentf387fa5df0180831abfd2004e78859d66836bc05 (diff)
downloadplatform-system-core-11aa6ee98c5cc67e149acb7c634f6c2546678c00.tar.gz
platform-system-core-11aa6ee98c5cc67e149acb7c634f6c2546678c00.tar.xz
platform-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/Android.mk')
-rw-r--r--liblog/Android.mk8
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
36 liblog_sources += \ 36 liblog_sources += \
37 logprint.c \ 37 logprint.c \
38 event_tag_map.c 38 event_tag_map.c
39ifneq ($(HOST_OS),darwin)
40 liblog_sources += \
41 log_read.c
42endif
43else 39else
44 liblog_sources += \ 40 liblog_sources += \
45 uio.c 41 uio.c
46endif 42endif
47 43
48liblog_host_sources := $(liblog_sources) fake_log_device.c 44liblog_host_sources := $(liblog_sources) fake_log_device.c
49 45liblog_target_sources = $(liblog_sources) log_read.c
50 46
51# Shared and static library for host 47# Shared and static library for host
52# ======================================================== 48# ========================================================
@@ -76,7 +72,7 @@ include $(BUILD_HOST_STATIC_LIBRARY)
76# ======================================================== 72# ========================================================
77include $(CLEAR_VARS) 73include $(CLEAR_VARS)
78LOCAL_MODULE := liblog 74LOCAL_MODULE := liblog
79LOCAL_SRC_FILES := $(liblog_sources) 75LOCAL_SRC_FILES := $(liblog_target_sources)
80include $(BUILD_STATIC_LIBRARY) 76include $(BUILD_STATIC_LIBRARY)
81 77
82include $(CLEAR_VARS) 78include $(CLEAR_VARS)