diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2016-10-04 18:32:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-04 18:32:14 +0000 |
| commit | cb670780be80e52168f5e992f8b8ddf1bdde1789 (patch) | |
| tree | a873c7147f8768846006e5330777e6284af96490 /debuggerd/debuggerd.cpp | |
| parent | aed39f1f3d322069ce5937a8d04ebb42247a1abc (diff) | |
| parent | 1f90485804c6d21018d947531c9495bb42d4ea50 (diff) | |
Merge "system/core: drop or replace log/logger.h"
am: 1f90485804
Change-Id: I5b4f756c3a683f2d8e0ebdb79600d4e30bc26849
Diffstat (limited to 'debuggerd/debuggerd.cpp')
| -rw-r--r-- | debuggerd/debuggerd.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/debuggerd/debuggerd.cpp b/debuggerd/debuggerd.cpp index 77c138f1e..a6d3d382e 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> |