summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2015-03-05 11:56:27 -0600
committerMark Salyzyn2015-03-05 13:10:00 -0600
commit1b79369877f91a2ac7e373a057409f0522faaa9d (patch)
tree18b64f94b2fccf75381e33b327c5eed95a580493 /liblog/Android.mk
parentb6c411cf07b6cfe0cb2df3bce80ab8097b5d0d97 (diff)
downloadplatform-system-core-1b79369877f91a2ac7e373a057409f0522faaa9d.tar.gz
platform-system-core-1b79369877f91a2ac7e373a057409f0522faaa9d.tar.xz
platform-system-core-1b79369877f91a2ac7e373a057409f0522faaa9d.zip
liblog: build cleanup
- Drop CYGWIN build checking - Hard code the "liblog" event tag - Drop use of internal WITH_MINGW Change-Id: I7b63bd7fa4471f340f356b477a0e5e25fe83a851
Diffstat (limited to 'liblog/Android.mk')
-rw-r--r--liblog/Android.mk22
1 files changed, 9 insertions, 13 deletions
diff --git a/liblog/Android.mk b/liblog/Android.mk
index ea179fac5..4e6424a2a 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -16,7 +16,13 @@
16LOCAL_PATH := $(my-dir) 16LOCAL_PATH := $(my-dir)
17include $(CLEAR_VARS) 17include $(CLEAR_VARS)
18 18
19liblog_cflags := $(shell sed -n 's/^\([0-9]*\)[ \t]*liblog[ \t].*/-DLIBLOG_LOG_TAG=\1/p' $(LOCAL_PATH)/event.logtags) 19# This is what we want to do:
20# liblog_cflags := $(shell \
21# sed -n \
22# 's/^\([0-9]*\)[ \t]*liblog[ \t].*/-DLIBLOG_LOG_TAG=\1/p' \
23# $(LOCAL_PATH)/event.logtags)
24# so make sure we do not regret hard-coding it as follows:
25liblog_cflags := -DLIBLOG_LOG_TAG=1005
20 26
21ifneq ($(TARGET_USES_LOGD),false) 27ifneq ($(TARGET_USES_LOGD),false)
22liblog_sources := logd_write.c 28liblog_sources := logd_write.c
@@ -27,18 +33,8 @@ endif
27# some files must not be compiled when building against Mingw 33# some files must not be compiled when building against Mingw
28# they correspond to features not used by our host development tools 34# they correspond to features not used by our host development tools
29# which are also hard or even impossible to port to native Win32 35# which are also hard or even impossible to port to native Win32
30WITH_MINGW :=
31ifeq ($(HOST_OS),windows)
32 ifeq ($(strip $(USE_CYGWIN)),)
33 WITH_MINGW := true
34 endif
35endif
36# USE_MINGW is defined when we build against Mingw on Linux
37ifneq ($(strip $(USE_MINGW)),)
38 WITH_MINGW := true
39endif
40 36
41ifndef WITH_MINGW 37ifeq ($(strip $(USE_MINGW)),)
42 liblog_sources += \ 38 liblog_sources += \
43 event_tag_map.c 39 event_tag_map.c
44else 40else
@@ -48,7 +44,7 @@ endif
48 44
49liblog_host_sources := $(liblog_sources) fake_log_device.c event.logtags 45liblog_host_sources := $(liblog_sources) fake_log_device.c event.logtags
50liblog_target_sources := $(liblog_sources) log_time.cpp log_is_loggable.c 46liblog_target_sources := $(liblog_sources) log_time.cpp log_is_loggable.c
51ifndef WITH_MINGW 47ifeq ($(strip $(USE_MINGW)),)
52liblog_target_sources += logprint.c 48liblog_target_sources += logprint.c
53endif 49endif
54ifneq ($(TARGET_USES_LOGD),false) 50ifneq ($(TARGET_USES_LOGD),false)