From d272e0ee346e04d2871075ce08c32e58ec12f305 Mon Sep 17 00:00:00 2001 From: Scott Mertz Date: Wed, 25 May 2016 15:47:42 -0700 Subject: [PATCH] debuggerd: add tequila version to tombstones Change-Id: I7822a2e133a2f326ad2d8da8f79b0064344d59bf debuggerd: Rebrand tombstone header to LineageOS [harryyoud]: Use new props for 15.1 [rashed]: Bah... use GetProperty [mkbestas]: Rewrite for T Change-Id: Idd08c2eb7e395b464b1510742bf52833f465db08 Signed-off-by: zlewchan --- debuggerd/libdebuggerd/tombstone_proto.cpp | 1 + debuggerd/libdebuggerd/tombstone_proto_to_text.cpp | 1 + debuggerd/proto/tombstone.proto | 1 + 3 files changed, 3 insertions(+) diff --git a/debuggerd/libdebuggerd/tombstone_proto.cpp b/debuggerd/libdebuggerd/tombstone_proto.cpp index 3e8ab6ea5..bc52d48d6 100644 --- a/debuggerd/libdebuggerd/tombstone_proto.cpp +++ b/debuggerd/libdebuggerd/tombstone_proto.cpp @@ -719,6 +719,7 @@ void engrave_tombstone_proto(Tombstone* tombstone, unwindstack::AndroidUnwinder* } else { result.set_guest_arch(Architecture::NONE); } + result.set_tequila_version(android::base::GetProperty("ro.tequila.version", "unknown")); result.set_build_fingerprint(android::base::GetProperty("ro.build.fingerprint", "unknown")); result.set_revision(android::base::GetProperty("ro.revision", "unknown")); result.set_timestamp(get_timestamp()); diff --git a/debuggerd/libdebuggerd/tombstone_proto_to_text.cpp b/debuggerd/libdebuggerd/tombstone_proto_to_text.cpp index 19007194e..dda2c5336 100644 --- a/debuggerd/libdebuggerd/tombstone_proto_to_text.cpp +++ b/debuggerd/libdebuggerd/tombstone_proto_to_text.cpp @@ -594,6 +594,7 @@ static void print_guest_thread(CallbackType callback, const Tombstone& tombstone bool tombstone_proto_to_text(const Tombstone& tombstone, CallbackType callback) { CBL("*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***"); + CBL("tequilaOS Version: '%s'", tombstone.tequila_version().c_str()); CBL("Build fingerprint: '%s'", tombstone.build_fingerprint().c_str()); CBL("Revision: '%s'", tombstone.revision().c_str()); CBL("ABI: '%s'", abi_string(tombstone.arch())); diff --git a/debuggerd/proto/tombstone.proto b/debuggerd/proto/tombstone.proto index b662d3680..48c72e644 100644 --- a/debuggerd/proto/tombstone.proto +++ b/debuggerd/proto/tombstone.proto @@ -25,6 +25,7 @@ message CrashDetail { message Tombstone { Architecture arch = 1; Architecture guest_arch = 24; + string tequila_version = 2137; string build_fingerprint = 2; string revision = 3; string timestamp = 4;