Merge "[CrashReporting] Correct guest arch init" into main am: c438dab75e am: 4269705b0c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3126753
Change-Id: I67c06d110ae0772499184baa049cb497a00bd8ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/debuggerd/crash_dump.cpp b/debuggerd/crash_dump.cpp
index 1c1fb8a..8dd2b0d 100644
--- a/debuggerd/crash_dump.cpp
+++ b/debuggerd/crash_dump.cpp
@@ -83,7 +83,7 @@
// This stores guest architecture. When the architecture is supported, tombstone file will output
// guest state information.
-static Architecture g_guest_arch;
+static Architecture g_guest_arch = Architecture::NONE;
static bool pid_contains_tid(int pid_proc_fd, pid_t tid) {
struct stat st;
@@ -789,10 +789,6 @@
ATRACE_NAME("engrave_tombstone");
unwindstack::ArchEnum regs_arch = unwindstack::ARCH_UNKNOWN;
switch (g_guest_arch) {
- case Architecture::ARM32: {
- regs_arch = unwindstack::ARCH_ARM;
- break;
- }
case Architecture::ARM64: {
regs_arch = unwindstack::ARCH_ARM64;
break;