summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2014-02-11 14:29:31 -0600
committerMark Salyzyn2014-03-13 16:48:07 -0500
commitdfa7a07f5be656cfafdb4e75916bc9dcd9e592e7 (patch)
treea8e488d706cad455822767ee92ba198acb58f3b7 /liblog/Android.mk
parent64d6fe936253b336049c285369a56cf139bd002f (diff)
downloadplatform-system-core-dfa7a07f5be656cfafdb4e75916bc9dcd9e592e7.tar.gz
platform-system-core-dfa7a07f5be656cfafdb4e75916bc9dcd9e592e7.tar.xz
platform-system-core-dfa7a07f5be656cfafdb4e75916bc9dcd9e592e7.zip
logd: liblog: logcat: Add LogWhiteBlackList
- liblog android_logger_get_log_size and android_logger_get_readable_size adjusted to return long instead of int because of -G flag extending range NB: ifdef'd only for userdebug and eng builds - liblog Add android_logger_[sg]et_prune_list and android_logger_set_log_size - logcat Add -P, -p and -G flags - logd Add LogWhiteBlackList and configurable log size (cherry picked from commit 18a5432158ad43b8faefe4950b30e760200ce0b4) Change-Id: I1572338c1b34bd968ad7867857ef708156ec3b6a
Diffstat (limited to 'liblog/Android.mk')
-rw-r--r--liblog/Android.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/liblog/Android.mk b/liblog/Android.mk
index c18dc48c1..4fe20db2f 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -22,6 +22,10 @@ else
22liblog_sources := logd_write_kern.c 22liblog_sources := logd_write_kern.c
23endif 23endif
24 24
25ifneq ($(filter userdebug eng,$(TARGET_BUILD_VARIANT)),)
26liblog_cflags := -DUSERDEBUG_BUILD=1
27endif
28
25# some files must not be compiled when building against Mingw 29# some files must not be compiled when building against Mingw
26# they correspond to features not used by our host development tools 30# they correspond to features not used by our host development tools
27# which are also hard or even impossible to port to native Win32 31# which are also hard or even impossible to port to native Win32
@@ -80,11 +84,13 @@ include $(BUILD_HOST_STATIC_LIBRARY)
80include $(CLEAR_VARS) 84include $(CLEAR_VARS)
81LOCAL_MODULE := liblog 85LOCAL_MODULE := liblog
82LOCAL_SRC_FILES := $(liblog_target_sources) 86LOCAL_SRC_FILES := $(liblog_target_sources)
87LOCAL_CFLAGS := $(liblog_cflags)
83include $(BUILD_STATIC_LIBRARY) 88include $(BUILD_STATIC_LIBRARY)
84 89
85include $(CLEAR_VARS) 90include $(CLEAR_VARS)
86LOCAL_MODULE := liblog 91LOCAL_MODULE := liblog
87LOCAL_WHOLE_STATIC_LIBRARIES := liblog 92LOCAL_WHOLE_STATIC_LIBRARIES := liblog
93LOCAL_CFLAGS := $(liblog_cflags)
88include $(BUILD_SHARED_LIBRARY) 94include $(BUILD_SHARED_LIBRARY)
89 95
90include $(call first-makefiles-under,$(LOCAL_PATH)) 96include $(call first-makefiles-under,$(LOCAL_PATH))