diff options
Diffstat (limited to 'debuggerd')
| -rw-r--r-- | debuggerd/arm/machine.cpp | 2 | ||||
| -rw-r--r-- | debuggerd/arm64/machine.cpp | 2 | ||||
| -rw-r--r-- | debuggerd/backtrace.cpp | 15 | ||||
| -rw-r--r-- | debuggerd/crasher.cpp | 2 | ||||
| -rw-r--r-- | debuggerd/elf_utils.cpp | 4 | ||||
| -rw-r--r-- | debuggerd/mips/machine.cpp | 2 | ||||
| -rw-r--r-- | debuggerd/mips64/machine.cpp | 2 | ||||
| -rw-r--r-- | debuggerd/test/log_fake.cpp | 2 | ||||
| -rw-r--r-- | debuggerd/tombstone.cpp | 12 | ||||
| -rw-r--r-- | debuggerd/utility.cpp | 4 | ||||
| -rw-r--r-- | debuggerd/x86/machine.cpp | 2 | ||||
| -rw-r--r-- | debuggerd/x86_64/machine.cpp | 2 |
12 files changed, 24 insertions, 27 deletions
diff --git a/debuggerd/arm/machine.cpp b/debuggerd/arm/machine.cpp index 78c230615..292edcba0 100644 --- a/debuggerd/arm/machine.cpp +++ b/debuggerd/arm/machine.cpp @@ -22,8 +22,8 @@ #include <string.h> #include <sys/ptrace.h> +#include <android/log.h> #include <backtrace/Backtrace.h> -#include <log/log.h> #include "machine.h" #include "utility.h" diff --git a/debuggerd/arm64/machine.cpp b/debuggerd/arm64/machine.cpp index e7bf79a8f..cd1bd528c 100644 --- a/debuggerd/arm64/machine.cpp +++ b/debuggerd/arm64/machine.cpp @@ -24,8 +24,8 @@ #include <sys/ptrace.h> #include <sys/uio.h> +#include <android/log.h> #include <backtrace/Backtrace.h> -#include <log/log.h> #include "machine.h" #include "utility.h" diff --git a/debuggerd/backtrace.cpp b/debuggerd/backtrace.cpp index 8f4a53f57..06c1efeca 100644 --- a/debuggerd/backtrace.cpp +++ b/debuggerd/backtrace.cpp @@ -16,25 +16,24 @@ #define LOG_TAG "DEBUG" +#include <errno.h> +#include <dirent.h> +#include <limits.h> #include <stddef.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <stdio.h> +#include <sys/ptrace.h> +#include <sys/types.h> #include <time.h> -#include <errno.h> -#include <limits.h> -#include <dirent.h> #include <unistd.h> -#include <sys/types.h> -#include <sys/ptrace.h> #include <memory> #include <string> +#include <android/log.h> #include <backtrace/Backtrace.h> -#include <log/log.h> - #include "backtrace.h" #include "utility.h" diff --git a/debuggerd/crasher.cpp b/debuggerd/crasher.cpp index a37df3350..7d3509c76 100644 --- a/debuggerd/crasher.cpp +++ b/debuggerd/crasher.cpp @@ -13,8 +13,8 @@ #include <sys/wait.h> #include <unistd.h> +#include <android/log.h> #include <cutils/sockets.h> -#include <log/log.h> #if defined(STATIC_CRASHER) #include "debuggerd/client.h" diff --git a/debuggerd/elf_utils.cpp b/debuggerd/elf_utils.cpp index 3d99cab31..d760a37da 100644 --- a/debuggerd/elf_utils.cpp +++ b/debuggerd/elf_utils.cpp @@ -23,9 +23,9 @@ #include <string> -#include <backtrace/Backtrace.h> +#include <android/log.h> #include <android-base/stringprintf.h> -#include <log/log.h> +#include <backtrace/Backtrace.h> #include "elf_utils.h" diff --git a/debuggerd/mips/machine.cpp b/debuggerd/mips/machine.cpp index cbf272a36..99a9d65a5 100644 --- a/debuggerd/mips/machine.cpp +++ b/debuggerd/mips/machine.cpp @@ -22,8 +22,8 @@ #include <string.h> #include <sys/ptrace.h> +#include <android/log.h> #include <backtrace/Backtrace.h> -#include <log/log.h> #include "machine.h" #include "utility.h" diff --git a/debuggerd/mips64/machine.cpp b/debuggerd/mips64/machine.cpp index 0a8d53257..ecd1ca2c8 100644 --- a/debuggerd/mips64/machine.cpp +++ b/debuggerd/mips64/machine.cpp @@ -22,8 +22,8 @@ #include <string.h> #include <sys/ptrace.h> +#include <android/log.h> #include <backtrace/Backtrace.h> -#include <log/log.h> #include "machine.h" #include "utility.h" diff --git a/debuggerd/test/log_fake.cpp b/debuggerd/test/log_fake.cpp index e27e9f661..ebf966faa 100644 --- a/debuggerd/test/log_fake.cpp +++ b/debuggerd/test/log_fake.cpp @@ -19,8 +19,8 @@ #include <string> +#include <android/log.h> #include <android-base/stringprintf.h> -#include <log/log.h> #include <log/logger.h> // Forward declarations. diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp index e66392023..5c7f02423 100644 --- a/debuggerd/tombstone.cpp +++ b/debuggerd/tombstone.cpp @@ -25,23 +25,21 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <time.h> #include <sys/ptrace.h> #include <sys/stat.h> +#include <time.h> #include <memory> #include <string> -#include <private/android_filesystem_config.h> - +#include <android/log.h> #include <android-base/stringprintf.h> +#include <backtrace/Backtrace.h> +#include <backtrace/BacktraceMap.h> #include <cutils/properties.h> -#include <log/log.h> #include <log/logger.h> #include <log/logprint.h> - -#include <backtrace/Backtrace.h> -#include <backtrace/BacktraceMap.h> +#include <private/android_filesystem_config.h> #include <selinux/android.h> diff --git a/debuggerd/utility.cpp b/debuggerd/utility.cpp index 7fabf690b..e334e715c 100644 --- a/debuggerd/utility.cpp +++ b/debuggerd/utility.cpp @@ -21,15 +21,15 @@ #include <errno.h> #include <signal.h> #include <string.h> -#include <unistd.h> #include <sys/ptrace.h> #include <sys/wait.h> +#include <unistd.h> #include <string> +#include <android/log.h> #include <android-base/stringprintf.h> #include <backtrace/Backtrace.h> -#include <log/log.h> // Whitelist output desired in the logcat output. bool is_allowed_in_logcat(enum logtype ltype) { diff --git a/debuggerd/x86/machine.cpp b/debuggerd/x86/machine.cpp index af10817a4..a6f21e1fc 100644 --- a/debuggerd/x86/machine.cpp +++ b/debuggerd/x86/machine.cpp @@ -21,8 +21,8 @@ #include <string.h> #include <sys/ptrace.h> +#include <android/log.h> #include <backtrace/Backtrace.h> -#include <log/log.h> #include "machine.h" #include "utility.h" diff --git a/debuggerd/x86_64/machine.cpp b/debuggerd/x86_64/machine.cpp index fc86bc2b9..705e12df3 100644 --- a/debuggerd/x86_64/machine.cpp +++ b/debuggerd/x86_64/machine.cpp @@ -22,8 +22,8 @@ #include <string.h> #include <sys/user.h> +#include <android/log.h> #include <backtrace/Backtrace.h> -#include <log/log.h> #include "machine.h" #include "utility.h" |