• R/O
  • HTTP
  • SSH
  • HTTPS

提交

標籤
無標籤

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

system/core


Commit MetaInfo

修訂98877cbabef1c496fd0e272c7e659c84f85e6b69 (tree)
時間2019-04-10 05:22:51
作者Christopher Ferris <cferris@goog...>
CommiterChristopher Ferris

Log Message

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)

Change Summary

差異

--- a/debuggerd/libdebuggerd/include/libdebuggerd/utility.h
+++ b/debuggerd/libdebuggerd/include/libdebuggerd/utility.h
@@ -18,6 +18,7 @@
1818 #ifndef _DEBUGGERD_UTILITY_H
1919 #define _DEBUGGERD_UTILITY_H
2020
21+#include <inttypes.h>
2122 #include <signal.h>
2223 #include <stdbool.h>
2324 #include <sys/types.h>
@@ -25,7 +26,6 @@
2526 #include <string>
2627
2728 #include <android-base/macros.h>
28-#include <backtrace/Backtrace.h>
2929
3030 struct log_t {
3131 // Tombstone file descriptor.
@@ -61,6 +61,14 @@ enum logtype {
6161 OPEN_FILES
6262 };
6363
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+
6472 // Log information onto the tombstone.
6573 void _LOG(log_t* log, logtype ltype, const char* fmt, ...) __attribute__((format(printf, 3, 4)));
6674
--- a/debuggerd/libdebuggerd/test/tombstone_test.cpp
+++ b/debuggerd/libdebuggerd/test/tombstone_test.cpp
@@ -15,6 +15,7 @@
1515 */
1616
1717 #include <stdlib.h>
18+#include <sys/mman.h>
1819 #include <time.h>
1920
2021 #include <memory>
--- a/debuggerd/libdebuggerd/tombstone.cpp
+++ b/debuggerd/libdebuggerd/tombstone.cpp
@@ -27,6 +27,7 @@
2727 #include <stdio.h>
2828 #include <stdlib.h>
2929 #include <string.h>
30+#include <sys/mman.h>
3031 #include <sys/ptrace.h>
3132 #include <sys/stat.h>
3233 #include <time.h>
--- a/debuggerd/libdebuggerd/utility.cpp
+++ b/debuggerd/libdebuggerd/utility.cpp
@@ -35,7 +35,6 @@
3535 #include <android-base/stringprintf.h>
3636 #include <android-base/strings.h>
3737 #include <android-base/unique_fd.h>
38-#include <backtrace/Backtrace.h>
3938 #include <debuggerd/handler.h>
4039 #include <log/log.h>
4140 #include <unwindstack/Memory.h>