diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2016-09-30 13:30:33 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2016-10-24 11:12:49 -0700 |
| commit | aeaaf81c2cc8366ac4f66eb3d2fc85f9b8194982 (patch) | |
| tree | f71ad7073f0ab58e7cc97a0218f2d8b38883c79e /logcat | |
| parent | 749a298dfd6791644cc2815989248984bf7ab2c2 (diff) | |
| download | system_core-aeaaf81c2cc8366ac4f66eb3d2fc85f9b8194982.tar.gz system_core-aeaaf81c2cc8366ac4f66eb3d2fc85f9b8194982.tar.bz2 system_core-aeaaf81c2cc8366ac4f66eb3d2fc85f9b8194982.zip | |
liblog: logd: logcat: Split out log/logger.h into public and private.
log/logger.h pieces moved into log/log.h. Correct for some
minor Android Coding standards.
Test: gTests liblog-unit-tests, logd-unit-tests and logcat-unit-tests
Bug: 19235719
Bug: 26552300
Bug: 31289077
Bug: 31456426
Change-Id: I0a19fd8788eec20a582e72e4c62c04534bdb1b9a
Diffstat (limited to 'logcat')
| -rw-r--r-- | logcat/logcat.cpp | 3 | ||||
| -rw-r--r-- | logcat/tests/logcat_test.cpp | 3 |
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) |