Merge "[CrashReporting] Correct guest arch init" into main am: c438dab75e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3126753 Change-Id: Ic64e9b98306f855ed23b42242f069abd4ce145b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
4269705b0c
1 changed files with 1 additions and 5 deletions
|
@ -83,7 +83,7 @@ using android::base::unique_fd;
|
|||
|
||||
// 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 @@ int main(int argc, char** argv) {
|
|||
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;
|
||||
|
|
Loading…
Reference in a new issue