Merge "system/core: drop or replace log/logger.h" am: 1f90485804

am: cb670780be

Change-Id: I532a0f6143511f53f3303751f95de115ac034cd7

debuggerd/debuggerd.cpp

@@ -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>

debuggerd/signal_sender.cpp

@@ -24,7 +24,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <log/logger.h>
+#include <android/log.h>
 
 #include "signal_sender.h"
 

debuggerd/test/log_fake.cpp

@@ -21,7 +21,6 @@
 
 #include <android/log.h>
 #include <android-base/stringprintf.h>
-#include <log/logger.h>
 
 // Forward declarations.
 class Backtrace;

debuggerd/tombstone.cpp

@@ -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>
 

include/log/logprint.h

@@ -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" {

include/private/android_logger.h

@@ -25,7 +25,7 @@
 #include <sys/types.h>
 
 #include <android/log.h>
-#include <log/logger.h>
+#include <log/logger.h> /* log_time */
 
 #define LOGGER_MAGIC 'l'
 

liblog/logprint.c

@@ -33,6 +33,7 @@
 
 #include <android/log.h>
 #include <cutils/list.h>
+#include <log/logger.h>
 #include <log/logprint.h>
 
 #include "log_portability.h"