diff options
author | Mark Salyzyn | 2015-03-05 11:56:27 -0600 |
---|---|---|
committer | Mark Salyzyn | 2015-03-05 13:10:00 -0600 |
commit | 1b79369877f91a2ac7e373a057409f0522faaa9d (patch) | |
tree | 18b64f94b2fccf75381e33b327c5eed95a580493 | |
parent | b6c411cf07b6cfe0cb2df3bce80ab8097b5d0d97 (diff) | |
download | platform-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
-rw-r--r-- | liblog/Android.mk | 22 |
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 @@ | |||
16 | LOCAL_PATH := $(my-dir) | 16 | LOCAL_PATH := $(my-dir) |
17 | include $(CLEAR_VARS) | 17 | include $(CLEAR_VARS) |
18 | 18 | ||
19 | liblog_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: | ||
25 | liblog_cflags := -DLIBLOG_LOG_TAG=1005 | ||
20 | 26 | ||
21 | ifneq ($(TARGET_USES_LOGD),false) | 27 | ifneq ($(TARGET_USES_LOGD),false) |
22 | liblog_sources := logd_write.c | 28 | liblog_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 |
30 | WITH_MINGW := | ||
31 | ifeq ($(HOST_OS),windows) | ||
32 | ifeq ($(strip $(USE_CYGWIN)),) | ||
33 | WITH_MINGW := true | ||
34 | endif | ||
35 | endif | ||
36 | # USE_MINGW is defined when we build against Mingw on Linux | ||
37 | ifneq ($(strip $(USE_MINGW)),) | ||
38 | WITH_MINGW := true | ||
39 | endif | ||
40 | 36 | ||
41 | ifndef WITH_MINGW | 37 | ifeq ($(strip $(USE_MINGW)),) |
42 | liblog_sources += \ | 38 | liblog_sources += \ |
43 | event_tag_map.c | 39 | event_tag_map.c |
44 | else | 40 | else |
@@ -48,7 +44,7 @@ endif | |||
48 | 44 | ||
49 | liblog_host_sources := $(liblog_sources) fake_log_device.c event.logtags | 45 | liblog_host_sources := $(liblog_sources) fake_log_device.c event.logtags |
50 | liblog_target_sources := $(liblog_sources) log_time.cpp log_is_loggable.c | 46 | liblog_target_sources := $(liblog_sources) log_time.cpp log_is_loggable.c |
51 | ifndef WITH_MINGW | 47 | ifeq ($(strip $(USE_MINGW)),) |
52 | liblog_target_sources += logprint.c | 48 | liblog_target_sources += logprint.c |
53 | endif | 49 | endif |
54 | ifneq ($(TARGET_USES_LOGD),false) | 50 | ifneq ($(TARGET_USES_LOGD),false) |