diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2015-03-05 09:56:27 -0800 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2015-03-05 11:10:00 -0800 |
| commit | 1b79369877f91a2ac7e373a057409f0522faaa9d (patch) | |
| tree | 18b64f94b2fccf75381e33b327c5eed95a580493 /liblog | |
| parent | b6c411cf07b6cfe0cb2df3bce80ab8097b5d0d97 (diff) | |
| download | system_core-1b79369877f91a2ac7e373a057409f0522faaa9d.zip system_core-1b79369877f91a2ac7e373a057409f0522faaa9d.tar.gz system_core-1b79369877f91a2ac7e373a057409f0522faaa9d.tar.bz2 | |
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')
| -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 ea179fa..4e6424a 100644 --- a/liblog/Android.mk +++ b/liblog/Android.mk @@ -16,7 +16,13 @@ LOCAL_PATH := $(my-dir) include $(CLEAR_VARS) -liblog_cflags := $(shell sed -n 's/^\([0-9]*\)[ \t]*liblog[ \t].*/-DLIBLOG_LOG_TAG=\1/p' $(LOCAL_PATH)/event.logtags) +# This is what we want to do: +# liblog_cflags := $(shell \ +# sed -n \ +# 's/^\([0-9]*\)[ \t]*liblog[ \t].*/-DLIBLOG_LOG_TAG=\1/p' \ +# $(LOCAL_PATH)/event.logtags) +# so make sure we do not regret hard-coding it as follows: +liblog_cflags := -DLIBLOG_LOG_TAG=1005 ifneq ($(TARGET_USES_LOGD),false) liblog_sources := logd_write.c @@ -27,18 +33,8 @@ endif # some files must not be compiled when building against Mingw # they correspond to features not used by our host development tools # which are also hard or even impossible to port to native Win32 -WITH_MINGW := -ifeq ($(HOST_OS),windows) - ifeq ($(strip $(USE_CYGWIN)),) - WITH_MINGW := true - endif -endif -# USE_MINGW is defined when we build against Mingw on Linux -ifneq ($(strip $(USE_MINGW)),) - WITH_MINGW := true -endif -ifndef WITH_MINGW +ifeq ($(strip $(USE_MINGW)),) liblog_sources += \ event_tag_map.c else @@ -48,7 +44,7 @@ endif liblog_host_sources := $(liblog_sources) fake_log_device.c event.logtags liblog_target_sources := $(liblog_sources) log_time.cpp log_is_loggable.c -ifndef WITH_MINGW +ifeq ($(strip $(USE_MINGW)),) liblog_target_sources += logprint.c endif ifneq ($(TARGET_USES_LOGD),false) |