diff options
| author | Steven Laver <lavers@google.com> | 2019-12-12 15:29:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-12 15:29:36 +0000 |
| commit | a239544c7b06814b70fd970de7eaac234682fa52 (patch) | |
| tree | a4298d61f9b73642f350799b1157e49b65f4e1e8 /libunwindstack/Unwinder.cpp | |
| parent | 63de1e1c8d7824c241f22de67edf54f4f1eaeea5 (diff) | |
| parent | 5319412e5305a3b4bcecf251a2955c09a6e9837e (diff) | |
Merge "Merge RP1A.191203.001" into r-keystone-qcom-dev
Diffstat (limited to 'libunwindstack/Unwinder.cpp')
| -rw-r--r-- | libunwindstack/Unwinder.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libunwindstack/Unwinder.cpp b/libunwindstack/Unwinder.cpp index 0b9b85c65..1bb031947 100644 --- a/libunwindstack/Unwinder.cpp +++ b/libunwindstack/Unwinder.cpp @@ -34,9 +34,7 @@ #include <unwindstack/Memory.h> #include <unwindstack/Unwinder.h> -#if !defined(NO_LIBDEXFILE_SUPPORT) #include <unwindstack/DexFiles.h> -#endif // Use the demangler from libc++. extern "C" char* __cxa_demangle(const char*, char*, size_t*, int* status); @@ -84,7 +82,7 @@ void Unwinder::FillInDexFrame() { return; } -#if !defined(NO_LIBDEXFILE_SUPPORT) +#if defined(DEXFILE_SUPPORT) if (dex_files_ == nullptr) { return; } @@ -367,12 +365,10 @@ void Unwinder::SetJitDebug(JitDebug* jit_debug, ArchEnum arch) { jit_debug_ = jit_debug; } -#if !defined(NO_LIBDEXFILE_SUPPORT) void Unwinder::SetDexFiles(DexFiles* dex_files, ArchEnum arch) { dex_files->SetArch(arch); dex_files_ = dex_files; } -#endif bool UnwinderFromPid::Init(ArchEnum arch) { if (pid_ == getpid()) { @@ -390,7 +386,7 @@ bool UnwinderFromPid::Init(ArchEnum arch) { jit_debug_ptr_.reset(new JitDebug(process_memory_)); jit_debug_ = jit_debug_ptr_.get(); SetJitDebug(jit_debug_, arch); -#if !defined(NO_LIBDEXFILE_SUPPORT) +#if defined(DEXFILE_SUPPORT) dex_files_ptr_.reset(new DexFiles(process_memory_)); dex_files_ = dex_files_ptr_.get(); SetDexFiles(dex_files_, arch); |