system/core
修訂 | 98877cbabef1c496fd0e272c7e659c84f85e6b69 (tree) |
---|---|
時間 | 2019-04-10 05:22:51 |
作者 | Christopher Ferris <cferris@goog...> |
Commiter | Christopher Ferris |
Remove include of backtrace/Backtrace.h.
Somehow the code was still including this include from libbacktrace.
I think the libbacktrace include directory was coming from some
transitive includes. I verified that nothing in debuggerd is using
the libbacktace.so shared library.
Bug: 120606663
Test: Builds, unit tests pass.
Change-Id: I85c2837c5a539ccefc5a7140949988058d21697a
Merged-In: I85c2837c5a539ccefc5a7140949988058d21697a
(cherry picked from commit 3336c7bce087d33cc9ab0b02139b39551539f8a6)
@@ -18,6 +18,7 @@ | ||
18 | 18 | #ifndef _DEBUGGERD_UTILITY_H |
19 | 19 | #define _DEBUGGERD_UTILITY_H |
20 | 20 | |
21 | +#include <inttypes.h> | |
21 | 22 | #include <signal.h> |
22 | 23 | #include <stdbool.h> |
23 | 24 | #include <sys/types.h> |
@@ -25,7 +26,6 @@ | ||
25 | 26 | #include <string> |
26 | 27 | |
27 | 28 | #include <android-base/macros.h> |
28 | -#include <backtrace/Backtrace.h> | |
29 | 29 | |
30 | 30 | struct log_t { |
31 | 31 | // Tombstone file descriptor. |
@@ -61,6 +61,14 @@ enum logtype { | ||
61 | 61 | OPEN_FILES |
62 | 62 | }; |
63 | 63 | |
64 | +#if defined(__LP64__) | |
65 | +#define PRIPTR "016" PRIx64 | |
66 | +typedef uint64_t word_t; | |
67 | +#else | |
68 | +#define PRIPTR "08" PRIx64 | |
69 | +typedef uint32_t word_t; | |
70 | +#endif | |
71 | + | |
64 | 72 | // Log information onto the tombstone. |
65 | 73 | void _LOG(log_t* log, logtype ltype, const char* fmt, ...) __attribute__((format(printf, 3, 4))); |
66 | 74 |
@@ -15,6 +15,7 @@ | ||
15 | 15 | */ |
16 | 16 | |
17 | 17 | #include <stdlib.h> |
18 | +#include <sys/mman.h> | |
18 | 19 | #include <time.h> |
19 | 20 | |
20 | 21 | #include <memory> |
@@ -27,6 +27,7 @@ | ||
27 | 27 | #include <stdio.h> |
28 | 28 | #include <stdlib.h> |
29 | 29 | #include <string.h> |
30 | +#include <sys/mman.h> | |
30 | 31 | #include <sys/ptrace.h> |
31 | 32 | #include <sys/stat.h> |
32 | 33 | #include <time.h> |
@@ -35,7 +35,6 @@ | ||
35 | 35 | #include <android-base/stringprintf.h> |
36 | 36 | #include <android-base/strings.h> |
37 | 37 | #include <android-base/unique_fd.h> |
38 | -#include <backtrace/Backtrace.h> | |
39 | 38 | #include <debuggerd/handler.h> |
40 | 39 | #include <log/log.h> |
41 | 40 | #include <unwindstack/Memory.h> |