summaryrefslogtreecommitdiffstats
path: root/logcat
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2016-10-24 22:53:11 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-24 22:53:11 +0000
commit28fcac705b0c6c015b8d48c261b2895bfef13ea1 (patch)
tree68e21e5c02a840bc6106093de6181975a0356ff7 /logcat
parentf99573ae8cc78cb6ceb23a3f9653e21e44db6ba3 (diff)
parentaeaaf81c2cc8366ac4f66eb3d2fc85f9b8194982 (diff)
downloadsystem_core-28fcac705b0c6c015b8d48c261b2895bfef13ea1.tar.gz
system_core-28fcac705b0c6c015b8d48c261b2895bfef13ea1.tar.bz2
system_core-28fcac705b0c6c015b8d48c261b2895bfef13ea1.zip
liblog: logd: logcat: Split out log/logger.h into public and private.
am: aeaaf81c2c Change-Id: I124c69673c30bb5f2259849792ed4ca99f4d6b60
Diffstat (limited to 'logcat')
-rw-r--r--logcat/logcat.cpp3
-rw-r--r--logcat/tests/logcat_test.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index d1a23ae31..51d1a3afa 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -25,15 +25,14 @@
#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/logger.h>
#include <log/logprint.h>
+#include <private/android_logger.h>
#include <system/thread_defs.h>
#include <pcrecpp.h>
diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp
index 66800b15e..1baaf11cc 100644
--- a/logcat/tests/logcat_test.cpp
+++ b/logcat/tests/logcat_test.cpp
@@ -26,9 +26,8 @@
#include <memory>
-#include <android/log.h>
#include <gtest/gtest.h>
-#include <log/logger.h>
+#include <log/log.h>
#define BIG_BUFFER (5 * 1024)