Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c438dab7 authored by Sijie Chen's avatar Sijie Chen Committed by Gerrit Code Review
Browse files

Merge "[CrashReporting] Correct guest arch init" into main

parents fb30388a 06603fe1

debuggerd/crash_dump.cpp

+1 −5
Original line number Diff line number Diff line
@@ -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;