diff options
| -rw-r--r-- | liblog/Android.bp | 1 | ||||
| -rw-r--r-- | libunwindstack/RegsX86_64.cpp | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/liblog/Android.bp b/liblog/Android.bp index 6051ac7fa6..59ab250b98 100644 --- a/liblog/Android.bp +++ b/liblog/Android.bp @@ -43,6 +43,7 @@ cc_library_headers { "//apex_available:anyapex", ], min_sdk_version: "29", + sdk_version: "minimum", native_bridge_supported: true, export_include_dirs: ["include"], system_shared_libs: [], diff --git a/libunwindstack/RegsX86_64.cpp b/libunwindstack/RegsX86_64.cpp index c9e245d2f8..26d9f6578a 100644 --- a/libunwindstack/RegsX86_64.cpp +++ b/libunwindstack/RegsX86_64.cpp @@ -141,15 +141,14 @@ bool RegsX86_64::StepIfSignalHandler(uint64_t elf_offset, Elf* elf, Memory* proc return false; } - uint16_t data2; - if (!elf_memory->ReadFully(elf_offset + 8, &data2, sizeof(data2)) || data2 != 0x0f05) { + uint8_t data2; + if (!elf_memory->ReadFully(elf_offset + 8, &data2, sizeof(data2)) || data2 != 0x05) { return false; } // __restore_rt: // 0x48 0xc7 0xc0 0x0f 0x00 0x00 0x00 mov $0xf,%rax // 0x0f 0x05 syscall - // 0x0f nopl 0x0($rax) // Read the mcontext data from the stack. // sp points to the ucontext data structure, read only the mcontext part. |