diff options
| author | Christopher Ferris <cferris@google.com> | 2021-06-17 04:30:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-17 04:30:50 +0000 |
| commit | e62e27b3c485068da56289e5bc0f63ca143ddcc8 (patch) | |
| tree | 1e96a1253f1835e1f32d00a89a68705227aa46d1 | |
| parent | cd173e73e1e8b4ad155fc7611045bef100fb23c6 (diff) | |
| parent | 7cb7fd05e3e02c0473fda317c11080e21bfa882e (diff) | |
| download | unwinding-e62e27b3c485068da56289e5bc0f63ca143ddcc8.tar.gz | |
Remove CheckDexSupport check. am: 7cb7fd05e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/unwinding/+/15005271
Change-Id: I84fc8cb02ba316c99968e32aa3e5b0c292ef90d0
| -rw-r--r-- | libunwindstack/DexFile.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libunwindstack/DexFile.cpp b/libunwindstack/DexFile.cpp index e576354..15a814d 100644 --- a/libunwindstack/DexFile.cpp +++ b/libunwindstack/DexFile.cpp @@ -39,14 +39,6 @@ namespace unwindstack { std::map<DexFile::MappedFileKey, std::weak_ptr<DexFile::DexFileApi>> DexFile::g_mapped_dex_files; std::mutex DexFile::g_lock; -static bool CheckDexSupport() { - if (std::string err_msg; !art_api::dex::TryLoadLibdexfile(&err_msg)) { - ALOGW("Failed to initialize DEX file support: %s", err_msg.c_str()); - return false; - } - return true; -} - std::shared_ptr<DexFile> DexFile::CreateFromDisk(uint64_t addr, uint64_t size, MapInfo* map) { if (map == nullptr || map->name().empty()) { return nullptr; // MapInfo not backed by file. @@ -85,8 +77,7 @@ std::shared_ptr<DexFile> DexFile::CreateFromDisk(uint64_t addr, uint64_t size, M std::shared_ptr<DexFile> DexFile::Create(uint64_t base_addr, uint64_t file_size, Memory* memory, MapInfo* info) { - static bool has_dex_support = CheckDexSupport(); - if (!has_dex_support || file_size == 0) { + if (file_size == 0) { return nullptr; } |