liblog: logd: logcat: deprecate log/log_read.h am: 391a10de50 am: 78a459a8c8
am: 9785b288de
Change-Id: Icaab3eedecad8f55d8d1291b3414da5c12cec287
diff --git a/liblog/Android.bp b/liblog/Android.bp
index ba7cc8a..7f705ed 100644
--- a/liblog/Android.bp
+++ b/liblog/Android.bp
@@ -89,7 +89,6 @@
],
logtags: ["event.logtags"],
compile_multilib: "both",
- stl: "none",
}
ndk_library {
diff --git a/liblog/log_time.cpp b/liblog/log_time.cpp
index d2bf181..c8bd27d 100644
--- a/liblog/log_time.cpp
+++ b/liblog/log_time.cpp
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <string.h>
-#include <log/log_read.h>
+#include <log/logger.h>
#include "log_portability.h"
diff --git a/liblog/logd_reader.c b/liblog/logd_reader.c
index b894349..2da74ce 100644
--- a/liblog/logd_reader.c
+++ b/liblog/logd_reader.c
@@ -34,7 +34,6 @@
#include <cutils/sockets.h>
#include <log/logd.h>
#include <log/logger.h>
-#include <log/log_read.h>
#include <private/android_filesystem_config.h>
#include <private/android_logger.h>
diff --git a/liblog/logd_writer.c b/liblog/logd_writer.c
index ed82902..171647b 100644
--- a/liblog/logd_writer.c
+++ b/liblog/logd_writer.c
@@ -34,7 +34,6 @@
#include <cutils/sockets.h>
#include <log/logd.h>
#include <log/logger.h>
-#include <log/log_read.h>
#include <private/android_filesystem_config.h>
#include <private/android_logger.h>
diff --git a/liblog/logger.h b/liblog/logger.h
index 2a4cfcb..8367f44 100644
--- a/liblog/logger.h
+++ b/liblog/logger.h
@@ -22,7 +22,6 @@
#include <cutils/list.h>
#include <log/log.h>
-#include <log/log_read.h>
#include <log/logger.h>
#include "log_portability.h"
diff --git a/liblog/logger_write.c b/liblog/logger_write.c
index 08e6348..72673e0 100644
--- a/liblog/logger_write.c
+++ b/liblog/logger_write.c
@@ -27,7 +27,6 @@
#include <log/event_tag_map.h>
#include <log/logd.h>
#include <log/logger.h>
-#include <log/log_read.h>
#include <private/android_filesystem_config.h>
#include <private/android_logger.h>
diff --git a/liblog/tests/liblog_benchmark.cpp b/liblog/tests/liblog_benchmark.cpp
index f4e3089..22404d1 100644
--- a/liblog/tests/liblog_benchmark.cpp
+++ b/liblog/tests/liblog_benchmark.cpp
@@ -23,7 +23,6 @@
#include <cutils/sockets.h>
#include <log/log.h>
#include <log/logger.h>
-#include <log/log_read.h>
#include <private/android_logger.h>
#include "benchmark.h"
diff --git a/liblog/tests/liblog_test.cpp b/liblog/tests/liblog_test.cpp
index b3b44e3..cb9a522 100644
--- a/liblog/tests/liblog_test.cpp
+++ b/liblog/tests/liblog_test.cpp
@@ -26,7 +26,6 @@
#include <gtest/gtest.h>
#include <log/log.h>
#include <log/logger.h>
-#include <log/log_read.h>
#include <log/logprint.h>
#include <private/android_filesystem_config.h>
#include <private/android_logger.h>
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 7e2bac7..468b13f 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -32,7 +32,6 @@
#include <cutils/sockets.h>
#include <log/event_tag_map.h>
#include <log/log.h>
-#include <log/log_read.h>
#include <log/logd.h>
#include <log/logger.h>
#include <log/logprint.h>
diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp
index 3daee13..269bcc8 100644
--- a/logcat/tests/logcat_test.cpp
+++ b/logcat/tests/logcat_test.cpp
@@ -29,7 +29,6 @@
#include <gtest/gtest.h>
#include <log/log.h>
#include <log/logger.h>
-#include <log/log_read.h>
#define BIG_BUFFER (5 * 1024)
diff --git a/logd/FlushCommand.h b/logd/FlushCommand.h
index 7172d5f..a6cdf9d 100644
--- a/logd/FlushCommand.h
+++ b/logd/FlushCommand.h
@@ -16,7 +16,7 @@
#ifndef _FLUSH_COMMAND_H
#define _FLUSH_COMMAND_H
-#include <log/log_read.h>
+#include <log/logger.h>
#include <sysutils/SocketClientCommand.h>
class LogBufferElement;
diff --git a/logd/LogBuffer.h b/logd/LogBuffer.h
index 162c189..871e6bb 100644
--- a/logd/LogBuffer.h
+++ b/logd/LogBuffer.h
@@ -119,7 +119,7 @@
unsigned long getSize(log_id_t id);
int setSize(log_id_t id, unsigned long size);
unsigned long getSizeUsed(log_id_t id);
- // *strp uses malloc, use free to release.
+
std::string formatStatistics(uid_t uid, pid_t pid, unsigned int logMask);
void enableStatistics() {
diff --git a/logd/LogBufferElement.h b/logd/LogBufferElement.h
index e7f88b9..5a60c4d 100644
--- a/logd/LogBufferElement.h
+++ b/logd/LogBufferElement.h
@@ -23,7 +23,7 @@
#include <sysutils/SocketClient.h>
#include <log/log.h>
-#include <log/log_read.h>
+#include <log/logger.h>
class LogBuffer;
diff --git a/logd/LogKlog.h b/logd/LogKlog.h
index a4f871e..c0c1223 100644
--- a/logd/LogKlog.h
+++ b/logd/LogKlog.h
@@ -17,8 +17,8 @@
#ifndef _LOGD_LOG_KLOG_H__
#define _LOGD_LOG_KLOG_H__
+#include <log/logger.h>
#include <sysutils/SocketListener.h>
-#include <log/log_read.h>
char *log_strntok_r(char *s, size_t *len, char **saveptr, size_t *sublen);