logd: logcat: Replace log/log.h with android/log.h
Should use android/log.h instead of log/log.h as a good example
to all others.
Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: If4c9711eb57267d4707b03d54a932af9de241b13
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 5ac0758..d1a23ae 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -25,13 +25,13 @@
#include <memory>
#include <string>
+#include <android/log.h>
#include <android-base/file.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <cutils/sched_policy.h>
#include <cutils/sockets.h>
#include <log/event_tag_map.h>
-#include <log/log.h>
#include <log/logger.h>
#include <log/logprint.h>
#include <system/thread_defs.h>
diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp
index 269bcc8..9c9043e 100644
--- a/logcat/tests/logcat_test.cpp
+++ b/logcat/tests/logcat_test.cpp
@@ -26,8 +26,8 @@
#include <memory>
+#include <android/log.h>
#include <gtest/gtest.h>
-#include <log/log.h>
#include <log/logger.h>
#define BIG_BUFFER (5 * 1024)
diff --git a/logd/LogBuffer.h b/logd/LogBuffer.h
index 871e6bb..ff9692e 100644
--- a/logd/LogBuffer.h
+++ b/logd/LogBuffer.h
@@ -22,10 +22,9 @@
#include <list>
#include <string>
-#include <log/log.h>
-#include <sysutils/SocketClient.h>
-
+#include <android/log.h>
#include <private/android_filesystem_config.h>
+#include <sysutils/SocketClient.h>
#include "LogBufferElement.h"
#include "LogTimes.h"
diff --git a/logd/LogBufferElement.h b/logd/LogBufferElement.h
index 5a60c4d..f089550 100644
--- a/logd/LogBufferElement.h
+++ b/logd/LogBufferElement.h
@@ -21,8 +21,8 @@
#include <stdlib.h>
#include <sys/types.h>
+#include <android/log.h>
#include <sysutils/SocketClient.h>
-#include <log/log.h>
#include <log/logger.h>
class LogBuffer;
diff --git a/logd/LogStatistics.h b/logd/LogStatistics.h
index 878c333..e811953 100644
--- a/logd/LogStatistics.h
+++ b/logd/LogStatistics.h
@@ -25,8 +25,8 @@
#include <string> // std::string
#include <unordered_map>
+#include <android/log.h>
#include <android-base/stringprintf.h>
-#include <log/log.h>
#include <private/android_filesystem_config.h>
#include "LogBufferElement.h"
diff --git a/logd/LogTimes.h b/logd/LogTimes.h
index b66ff9e..8401953 100644
--- a/logd/LogTimes.h
+++ b/logd/LogTimes.h
@@ -23,8 +23,8 @@
#include <list>
+#include <android/log.h>
#include <sysutils/SocketClient.h>
-#include <log/log.h>
class LogReader;
class LogBufferElement;
diff --git a/logd/LogUtils.h b/logd/LogUtils.h
index fc66330..939515e 100644
--- a/logd/LogUtils.h
+++ b/logd/LogUtils.h
@@ -20,7 +20,7 @@
#include <sys/cdefs.h>
#include <sys/types.h>
-#include <log/log.h>
+#include <android/log.h>
#include <sysutils/SocketClient.h>
// Hijack this header as a common include file used by most all sources
diff --git a/logd/libaudit.c b/logd/libaudit.c
index d00d579..288a052 100644
--- a/logd/libaudit.c
+++ b/logd/libaudit.c
@@ -18,12 +18,13 @@
*
*/
+#define LOG_TAG "libaudit"
+
#include <errno.h>
#include <string.h>
#include <unistd.h>
-#define LOG_TAG "libaudit"
-#include <log/log.h>
+#include <android/log.h>
#include "libaudit.h"
diff --git a/logd/tests/logd_test.cpp b/logd/tests/logd_test.cpp
index 301ede9..cac8bce 100644
--- a/logd/tests/logd_test.cpp
+++ b/logd/tests/logd_test.cpp
@@ -23,11 +23,10 @@
#include <string>
-#include <gtest/gtest.h>
-
+#include <android/log.h>
#include <android-base/stringprintf.h>
#include <cutils/sockets.h>
-#include <log/log.h>
+#include <gtest/gtest.h>
#include <log/logger.h>
#include "../LogReader.h" // pickup LOGD_SNDTIMEO