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

Commit 4269705b authored by Sijie Chen's avatar Sijie Chen Committed by Automerger Merge Worker
Browse files

Merge "[CrashReporting] Correct guest arch init" into main am: c438dab7 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3126753



Change-Id: Ic64e9b98306f855ed23b42242f069abd4ce145b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9cb1921b c438dab7

debuggerd/crash_dump.cpp

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

// This stores guest architecture. When the architecture is supported, tombstone file will output

// guest state information.

// 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) {

static bool pid_contains_tid(int pid_proc_fd, pid_t tid) {

  struct stat st;

  struct stat st;
@@ -789,10 +789,6 @@ int main(int argc, char** argv) { 
      ATRACE_NAME("engrave_tombstone");

      ATRACE_NAME("engrave_tombstone");

      unwindstack::ArchEnum regs_arch = unwindstack::ARCH_UNKNOWN;

      unwindstack::ArchEnum regs_arch = unwindstack::ARCH_UNKNOWN;

      switch (g_guest_arch) {

      switch (g_guest_arch) {

        case Architecture::ARM32: {

          regs_arch = unwindstack::ARCH_ARM;

          break;

        }

        case Architecture::ARM64: {

        case Architecture::ARM64: {

          regs_arch = unwindstack::ARCH_ARM64;

          regs_arch = unwindstack::ARCH_ARM64;

          break;

          break;