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

Commit 631ce33f authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "system/core: drop or replace log/logger.h" am: 1f904858 am: cb670780 am: 6e5ffe26

am: 74ba3b0c

Change-Id: I542132517d0cc91f543bf5613dce97c457483177
parents 60c28ed3 74ba3b0c
Loading
Loading
Loading
Loading
+2 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@
#include <elf.h>
#include <errno.h>
#include <fcntl.h>
#include <linux/input.h>
#include <pthread.h>
#include <signal.h>
#include <stdarg.h>
@@ -39,16 +40,13 @@

#include <selinux/android.h>

#include <log/logger.h>

#include <android/log.h>
#include <android-base/file.h>
#include <android-base/unique_fd.h>
#include <cutils/debugger.h>
#include <cutils/properties.h>
#include <cutils/sockets.h>

#include <linux/input.h>

#include <private/android_filesystem_config.h>

#include <debuggerd/client.h>
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@
#include <sys/wait.h>
#include <unistd.h>

#include <log/logger.h>
#include <android/log.h>

#include "signal_sender.h"

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@

#include <android/log.h>
#include <android-base/stringprintf.h>
#include <log/logger.h>

// Forward declarations.
class Backtrace;
+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@
#include <backtrace/Backtrace.h>
#include <backtrace/BacktraceMap.h>
#include <cutils/properties.h>
#include <log/logger.h>
#include <log/logprint.h>
#include <private/android_filesystem_config.h>

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@

#include <android/log.h>
#include <log/event_tag_map.h>
#include <log/logger.h>
#include <log/logger.h> /* struct logger_entry */

#ifdef __cplusplus
extern "C" {
Loading