Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37b5edf6 authored by Tom Cherry's avatar Tom Cherry Committed by Gerrit Code Review
Browse files

Merge "liblog: remove LOGGER_LOCAL"

parents d9e73a00 d1febd33

liblog/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
liblog_sources = [

    "config_read.c",

    "config_write.c",

    "local_logger.c",

    "log_event_list.c",

    "log_event_write.c",

    "log_ratelimit.cpp",

liblog/README.md

+3 −4
Original line number Diff line number Diff line
@@ -145,10 +145,9 @@ that was used when opening the sub-log. It is recommended to open the log `ANDR 
these cases.



`android_set_log_transport()` selects transport filters.  Argument is either `LOGGER_DEFAULT`,

`LOGGER_LOGD`, `LOGGER_NULL` or `LOGGER_LOCAL`. Log to logger daemon for default or logd, drop

contents on floor, or log into local memory respectively.  `Both android_set_log_transport()` and

`android_get_log_transport()` return the current transport mask, or a negative errno for any

problems.

`LOGGER_LOGD`, or `LOGGER_NULL`. Log to logger daemon for default or logd, or drop contents on floor

respectively.  `Both android_set_log_transport()` and `android_get_log_transport()` return the

current transport mask, or a negative errno for any problems.



Errors

------

liblog/config_read.c

+0 −6
Original line number Diff line number Diff line
@@ -55,12 +55,6 @@ static void __android_log_add_transport( 
}



LIBLOG_HIDDEN void __android_log_config_read() {

  if (__android_log_transport & LOGGER_LOCAL) {

    extern struct android_log_transport_read localLoggerRead;



    __android_log_add_transport(&__android_log_transport_read, &localLoggerRead);

  }



#if (FAKE_LOG_DEVICE == 0)

  if ((__android_log_transport == LOGGER_DEFAULT) ||

      (__android_log_transport & LOGGER_LOGD)) {

liblog/config_write.c

+0 −7
Original line number Diff line number Diff line
@@ -55,13 +55,6 @@ static void __android_log_add_transport( 
}



LIBLOG_HIDDEN void __android_log_config_write() {

  if (__android_log_transport & LOGGER_LOCAL) {

    extern struct android_log_transport_write localLoggerWrite;



    __android_log_add_transport(&__android_log_transport_write,

                                &localLoggerWrite);

  }



  if ((__android_log_transport == LOGGER_DEFAULT) ||

      (__android_log_transport & LOGGER_LOGD)) {

#if (FAKE_LOG_DEVICE == 0)

liblog/include/log/log_transport.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ extern "C" { 
#define LOGGER_LOGD    0x01

#define LOGGER_KERNEL  0x02 /* Reserved/Deprecated */

#define LOGGER_NULL    0x04 /* Does not release resources of other selections */

#define LOGGER_LOCAL   0x08 /* logs sent to local memory */

#define LOGGER_RESERVED 0x08 /* Reserved, previously for logging to local memory */

#define LOGGER_STDERR  0x10 /* logs sent to stderr */

/* clang-format on */