summaryrefslogtreecommitdiffstats
path: root/logcat
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2016-09-30 22:17:47 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-30 22:17:47 +0000
commitc0a92b4a94c646fadad6e350dc0cf81c55bf72b2 (patch)
treea1a5b58d7115630ca60298dcb9ff9540308a0ac3 /logcat
parent9bb1f2f915bbf5c385b62360432f1847c8575248 (diff)
parenta8d0a469566d462dad94e78c3f7582489b0568ac (diff)
downloadsystem_core-c0a92b4a94c646fadad6e350dc0cf81c55bf72b2.tar.gz
system_core-c0a92b4a94c646fadad6e350dc0cf81c55bf72b2.tar.bz2
system_core-c0a92b4a94c646fadad6e350dc0cf81c55bf72b2.zip
logd: logcat: Replace log/log.h with android/log.h am: 0dd4431072 am: 0f76f04072
am: a8d0a46956 Change-Id: I7c43316eef4ae12e666ea6a0126a38ac571dd41e
Diffstat (limited to 'logcat')
-rw-r--r--logcat/logcat.cpp2
-rw-r--r--logcat/tests/logcat_test.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 5ac0758df..d1a23ae31 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 269bcc8a0..9c9043eb3 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)