diff options
author | Christopher Ferris <cferris@google.com> | 2018-10-30 16:16:45 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-30 16:16:45 +0000 |
commit | b31badf70f7734d1ef6d1a95ee73dc57ebd2b19d (patch) | |
tree | b150ea58a97519c38abf33f0654eb709d0c9846f /libbacktrace/UnwindStackMap.h | |
parent | 1d0ee36de7af27ee43e5075b99e9427130a1f0f1 (diff) | |
parent | 4568f4bc0f116f097a13b1d931de93cf525ae204 (diff) |
Merge "Verify that the elf matches the expected arch."
Diffstat (limited to 'libbacktrace/UnwindStackMap.h')
-rw-r--r-- | libbacktrace/UnwindStackMap.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libbacktrace/UnwindStackMap.h b/libbacktrace/UnwindStackMap.h index 039f4a289..e19b60565 100644 --- a/libbacktrace/UnwindStackMap.h +++ b/libbacktrace/UnwindStackMap.h @@ -30,6 +30,7 @@ #if !defined(NO_LIBDEXFILE_SUPPORT) #include <unwindstack/DexFiles.h> #endif +#include <unwindstack/Elf.h> #include <unwindstack/JitDebug.h> #include <unwindstack/Maps.h> @@ -58,6 +59,8 @@ class UnwindStackMap : public BacktraceMap { unwindstack::DexFiles* GetDexFiles() { return dex_files_.get(); } #endif + void SetArch(unwindstack::ArchEnum arch) { arch_ = arch; } + protected: uint64_t GetLoadBias(size_t index) override; @@ -67,6 +70,8 @@ class UnwindStackMap : public BacktraceMap { #if !defined(NO_LIBDEXFILE_SUPPORT) std::unique_ptr<unwindstack::DexFiles> dex_files_; #endif + + unwindstack::ArchEnum arch_ = unwindstack::ARCH_UNKNOWN; }; class UnwindStackOfflineMap : public UnwindStackMap { |