diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2016-10-04 18:33:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-04 18:33:44 +0000 |
| commit | 6e5ffe26807419987f2a6f536e5d1db2318fcb03 (patch) | |
| tree | 372dc66acc6385b409c7ee24fe3a27c0b4e7cbc7 /debuggerd | |
| parent | 2acb41b46c0a669a0cd329cf8de7f38d7195def2 (diff) | |
| parent | cb670780be80e52168f5e992f8b8ddf1bdde1789 (diff) | |
| download | system_core-6e5ffe26807419987f2a6f536e5d1db2318fcb03.tar.gz system_core-6e5ffe26807419987f2a6f536e5d1db2318fcb03.tar.bz2 system_core-6e5ffe26807419987f2a6f536e5d1db2318fcb03.zip | |
Merge "system/core: drop or replace log/logger.h" am: 1f90485804
am: cb670780be
Change-Id: I532a0f6143511f53f3303751f95de115ac034cd7
Diffstat (limited to 'debuggerd')
| -rw-r--r-- | debuggerd/debuggerd.cpp | 6 | ||||
| -rw-r--r-- | debuggerd/signal_sender.cpp | 2 | ||||
| -rw-r--r-- | debuggerd/test/log_fake.cpp | 1 | ||||
| -rw-r--r-- | debuggerd/tombstone.cpp | 1 |
4 files changed, 3 insertions, 7 deletions
diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp index 8b4641389..ee5328873 100644 --- a/debuggerd/debuggerd.cpp +++ b/debuggerd/debuggerd.cpp @@ -19,6 +19,7 @@ #include <elf.h> #include <errno.h> #include <fcntl.h> +#include <linux/input.h> #include <pthread.h> #include <signal.h> #include <stdarg.h> @@ -39,16 +40,13 @@ #include <selinux/android.h> -#include <log/logger.h> - +#include <android/log.h> #include <android-base/file.h> #include <android-base/unique_fd.h> #include <cutils/debugger.h> #include <cutils/properties.h> #include <cutils/sockets.h> -#include <linux/input.h> - #include <private/android_filesystem_config.h> #include <debuggerd/client.h> diff --git a/debuggerd/signal_sender.cpp b/debuggerd/signal_sender.cpp index 4be7e6e2b..3adbef2db 100644 --- a/debuggerd/signal_sender.cpp +++ b/debuggerd/signal_sender.cpp @@ -24,7 +24,7 @@ #include <sys/wait.h> #include <unistd.h> -#include <log/logger.h> +#include <android/log.h> #include "signal_sender.h" diff --git a/debuggerd/test/log_fake.cpp b/debuggerd/test/log_fake.cpp index ebf966faa..59910adab 100644 --- a/debuggerd/test/log_fake.cpp +++ b/debuggerd/test/log_fake.cpp @@ -21,7 +21,6 @@ #include <android/log.h> #include <android-base/stringprintf.h> -#include <log/logger.h> // Forward declarations. class Backtrace; diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp index 5c7f02423..c87182e88 100644 --- a/debuggerd/tombstone.cpp +++ b/debuggerd/tombstone.cpp @@ -37,7 +37,6 @@ #include <backtrace/Backtrace.h> #include <backtrace/BacktraceMap.h> #include <cutils/properties.h> -#include <log/logger.h> #include <log/logprint.h> #include <private/android_filesystem_config.h> |