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

Commit d4d561c6 authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "Don't include log/log_read.h in log/log.h" am: efe9defc

Change-Id: I73fcc9584ad5d6a78455b3cc0001c927017bd060
parents 472d1c49 efe9defc
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@
#include <android-base/unique_fd.h>
#include <android/log.h>
#include <log/log.h>
#include <log/log_read.h>
#include <log/logprint.h>
#include <private/android_filesystem_config.h>
#include <unwindstack/DexFiles.h>
+7 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@
#include <log/log_id.h>
#include <log/log_main.h>
#include <log/log_radio.h>
#include <log/log_read.h>
#include <log/log_safetynet.h>
#include <log/log_system.h>
#include <log/log_time.h>
@@ -64,6 +63,13 @@ extern "C" {
#endif
#endif

/*
 * The maximum size of the log entry payload that can be
 * written to the logger. An attempt to write more than
 * this amount will result in a truncated log entry.
 */
#define LOGGER_ENTRY_MAX_PAYLOAD 4068

/*
 * Event logging.
 */
+0 −7
Original line number Diff line number Diff line
@@ -47,13 +47,6 @@ struct logger_entry {
  uint32_t uid;      /* generating process's uid */
};

/*
 * The maximum size of the log entry payload that can be
 * written to the logger. An attempt to write more than
 * this amount will result in a truncated log entry.
 */
#define LOGGER_ENTRY_MAX_PAYLOAD 4068

/*
 * The maximum size of a log entry which can be read.
 * An attempt to read less than this amount may result
+3 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@
#define HAVE_STRSEP
#endif

#include <log/logprint.h>

#include <assert.h>
#include <ctype.h>
#include <errno.h>
@@ -37,7 +39,7 @@
#include <cutils/list.h>

#include <log/log.h>
#include <log/logprint.h>
#include <log/log_read.h>
#include <private/android_logger.h>

#define MS_PER_NSEC 1000000
+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@
#include <benchmark/benchmark.h>
#include <cutils/sockets.h>
#include <log/event_tag_map.h>
#include <log/log_read.h>
#include <private/android_logger.h>

BENCHMARK_MAIN();
Loading