summaryrefslogtreecommitdiffstats
path: root/liblog
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-01 17:19:47 -0700
committerMark Salyzyn <salyzyn@google.com>2014-04-02 13:12:04 -0700
commit1c950479393d42d18829d4009dbdb3a7f03acbb7 (patch)
tree1ba86b1f06f7df22e46ed2c022685fd71589d1bc /liblog
parent223fc42b5e289e882f67c893374ffbef595a6901 (diff)
downloadcore-1c950479393d42d18829d4009dbdb3a7f03acbb7.tar.gz
core-1c950479393d42d18829d4009dbdb3a7f03acbb7.tar.bz2
core-1c950479393d42d18829d4009dbdb3a7f03acbb7.zip
logd: liblog: logcat: enable prune features for user
- Enable whitelist, blacklist and logsize tuneables for user Change-Id: Id0c283844c71c5263a8cfbebf2e550f7ac415858
Diffstat (limited to 'liblog')
-rw-r--r--liblog/Android.mk4
-rw-r--r--liblog/log_read.c8
-rw-r--r--liblog/log_read_kern.c8
3 files changed, 0 insertions, 20 deletions
diff --git a/liblog/Android.mk b/liblog/Android.mk
index a23de2dbf..5e0190307 100644
--- a/liblog/Android.mk
+++ b/liblog/Android.mk
@@ -22,10 +22,6 @@ else
liblog_sources := logd_write_kern.c
endif
-ifneq ($(filter userdebug eng,$(TARGET_BUILD_VARIANT)),)
-liblog_cflags := -DUSERDEBUG_BUILD=1
-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
diff --git a/liblog/log_read.c b/liblog/log_read.c
index 2dd07e694..15be748f4 100644
--- a/liblog/log_read.c
+++ b/liblog/log_read.c
@@ -340,8 +340,6 @@ long android_logger_get_log_size(struct logger *logger)
return atol(buf);
}
-#ifdef USERDEBUG_BUILD
-
int android_logger_set_log_size(struct logger *logger, unsigned long size)
{
char buf[512];
@@ -352,8 +350,6 @@ int android_logger_set_log_size(struct logger *logger, unsigned long size)
return check_log_success(buf, send_log_msg(NULL, NULL, buf, sizeof(buf)));
}
-#endif /* USERDEBUG_BUILD */
-
/*
* returns the readable size of the log's ring buffer (that is, amount of the
* log consumed)
@@ -408,8 +404,6 @@ ssize_t android_logger_get_statistics(struct logger_list *logger_list,
return send_log_msg(NULL, NULL, buf, len);
}
-#ifdef USERDEBUG_BUILD
-
ssize_t android_logger_get_prune_list(struct logger_list *logger_list UNUSED,
char *buf, size_t len)
{
@@ -432,8 +426,6 @@ int android_logger_set_prune_list(struct logger_list *logger_list UNUSED,
return check_log_success(buf, send_log_msg(NULL, NULL, buf, len));
}
-#endif /* USERDEBUG_BUILD */
-
struct logger_list *android_logger_list_alloc(int mode,
unsigned int tail,
pid_t pid)
diff --git a/liblog/log_read_kern.c b/liblog/log_read_kern.c
index 9cccb1d50..d9a6b2e22 100644
--- a/liblog/log_read_kern.c
+++ b/liblog/log_read_kern.c
@@ -232,16 +232,12 @@ long android_logger_get_log_size(struct logger *logger)
return logger_ioctl(logger, LOGGER_GET_LOG_BUF_SIZE, O_RDWR);
}
-#ifdef USERDEBUG_BUILD
-
int android_logger_set_log_size(struct logger *logger UNUSED,
unsigned long size UNUSED)
{
return -ENOTSUP;
}
-#endif /* USERDEBUG_BUILD */
-
/*
* returns the readable size of the log's ring buffer (that is, amount of the
* log consumed)
@@ -272,8 +268,6 @@ ssize_t android_logger_get_statistics(struct logger_list *logger_list UNUSED,
return -ENOTSUP;
}
-#ifdef USERDEBUG_BUILD
-
ssize_t android_logger_get_prune_list(struct logger_list *logger_list UNUSED,
char *buf, size_t len)
{
@@ -289,8 +283,6 @@ int android_logger_set_prune_list(struct logger_list *logger_list UNUSED,
return -ENOTSUP;
}
-#endif /* USERDEBUG_BUILD */
-
struct logger_list *android_logger_list_alloc(int mode,
unsigned int tail,
pid_t pid)