summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-09-12 05:43:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-12 05:43:08 +0000
commit55fbad69a1d58ad623b14a489f668b84589c8554 (patch)
treee618cad248c242ca3bdc4cb153c27921ba08d2f3
parent5c9f25da9c6d02ba2a28bc5a41d6d3d7b2489aab (diff)
parentc3e6eb21b58ae3067ed03358687d1edb851f2abf (diff)
downloadsystem_core-55fbad69a1d58ad623b14a489f668b84589c8554.zip
system_core-55fbad69a1d58ad623b14a489f668b84589c8554.tar.gz
system_core-55fbad69a1d58ad623b14a489f668b84589c8554.tar.bz2
am c3e6eb21: Merge "Move ABI: line below header when dumping stacks." into lmp-dev
* commit 'c3e6eb21b58ae3067ed03358687d1edb851f2abf': Move ABI: line below header when dumping stacks.
-rw-r--r--debuggerd/backtrace.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/debuggerd/backtrace.cpp b/debuggerd/backtrace.cpp
index c4a2143..e49ef9b 100644
--- a/debuggerd/backtrace.cpp
+++ b/debuggerd/backtrace.cpp
@@ -49,13 +49,13 @@ static void dump_process_header(log_t* log, pid_t pid) {
struct tm tm;
localtime_r(&t, &tm);
char timestr[64];
- _LOG(log, logtype::BACKTRACE, "\n\nABI: '%s'\n", ABI_STRING);
strftime(timestr, sizeof(timestr), "%F %T", &tm);
- _LOG(log, logtype::BACKTRACE, "\n----- pid %d at %s -----\n", pid, timestr);
+ _LOG(log, logtype::BACKTRACE, "\n\n----- pid %d at %s -----\n", pid, timestr);
if (procname) {
_LOG(log, logtype::BACKTRACE, "Cmd line: %s\n", procname);
}
+ _LOG(log, logtype::BACKTRACE, "ABI: '%s'\n", ABI_STRING);
}
static void dump_process_footer(log_t* log, pid_t pid) {