summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen2015-08-13 16:43:34 -0500
committerDan Willemsen2015-09-02 19:10:35 -0500
commit87a419c8b1343c9025fe2593206a6e95b0aa9700 (patch)
treeebe871c66424c8f9d7d205f686b6cd681cb856ec /liblog/Android.mk
parent03bbd64aa99bb03bf80a9340750afa96bdb34280 (diff)
downloadplatform-system-core-87a419c8b1343c9025fe2593206a6e95b0aa9700.tar.gz
platform-system-core-87a419c8b1343c9025fe2593206a6e95b0aa9700.tar.xz
platform-system-core-87a419c8b1343c9025fe2593206a6e95b0aa9700.zip
Remove USE_MINGW/CYGWIN; Whitelist windows modules
CYGWIN is not supported, USE_MINGW and HOST_OS==windows are being replaced with LOCAL_..._windows variables. Bug: 23566667 Change-Id: I3e4a1e4097dc994cf5abdce6939e83a91758fd75
Diffstat (limited to 'liblog/Android.mk')
-rw-r--r--liblog/Android.mk31
1 files changed, 10 insertions, 21 deletions
diff --git a/liblog/Android.mk b/liblog/Android.mk
index 5eed63408..3a1a9db7a 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -24,41 +24,30 @@ include $(CLEAR_VARS)
24# so make sure we do not regret hard-coding it as follows: 24# so make sure we do not regret hard-coding it as follows:
25liblog_cflags := -DLIBLOG_LOG_TAG=1005 25liblog_cflags := -DLIBLOG_LOG_TAG=1005
26 26
27liblog_sources := logd_write.c log_event_write.c 27liblog_host_sources := logd_write.c log_event_write.c fake_log_device.c event.logtags
28 28liblog_target_sources := logd_write.c log_event_write.c event_tag_map.c log_time.cpp log_is_loggable.c
29# some files must not be compiled when building against Mingw
30# they correspond to features not used by our host development tools
31# which are also hard or even impossible to port to native Win32
32
33ifeq ($(strip $(USE_MINGW)),)
34 liblog_sources += \
35 event_tag_map.c
36else
37 liblog_sources += \
38 uio.c
39endif
40
41liblog_host_sources := $(liblog_sources) fake_log_device.c event.logtags
42liblog_target_sources := $(liblog_sources) log_time.cpp log_is_loggable.c
43ifeq ($(strip $(USE_MINGW)),)
44liblog_target_sources += logprint.c 29liblog_target_sources += logprint.c
45endif
46liblog_target_sources += log_read.c 30liblog_target_sources += log_read.c
47 31
48# Shared and static library for host 32# Shared and static library for host
49# ======================================================== 33# ========================================================
50LOCAL_MODULE := liblog 34LOCAL_MODULE := liblog
51LOCAL_SRC_FILES := $(liblog_host_sources) 35LOCAL_SRC_FILES := $(liblog_host_sources)
36# some files must not be compiled when building against Mingw
37# they correspond to features not used by our host development tools
38# which are also hard or even impossible to port to native Win32
39LOCAL_SRC_FILES_darwin := event_tag_map.c
40LOCAL_SRC_FILES_linux := event_tag_map.c
41LOCAL_SRC_FILES_windows := uio.c
52LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -Werror $(liblog_cflags) 42LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -Werror $(liblog_cflags)
53LOCAL_MULTILIB := both 43LOCAL_MULTILIB := both
44LOCAL_MODULE_HOST_OS := darwin linux windows
54include $(BUILD_HOST_STATIC_LIBRARY) 45include $(BUILD_HOST_STATIC_LIBRARY)
55 46
56include $(CLEAR_VARS) 47include $(CLEAR_VARS)
57LOCAL_MODULE := liblog 48LOCAL_MODULE := liblog
58LOCAL_WHOLE_STATIC_LIBRARIES := liblog 49LOCAL_WHOLE_STATIC_LIBRARIES := liblog
59ifeq ($(strip $(HOST_OS)),linux) 50LOCAL_LDLIBS_linux := -lrt
60LOCAL_LDLIBS := -lrt
61endif
62LOCAL_MULTILIB := both 51LOCAL_MULTILIB := both
63LOCAL_CXX_STL := none 52LOCAL_CXX_STL := none
64include $(BUILD_HOST_SHARED_LIBRARY) 53include $(BUILD_HOST_SHARED_LIBRARY)