commit d258206bd33e438255eb9349cde0788c2113da4f
author Jiyong Park <jiyong@google.com> Fri Jan 11 09:22:15 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Jan 11 09:22:15 2019 -0800
tree ab1496bdb6356e8af1aa07480f1f9ca29d4696aa
parent 8c7b5cba93c021317258081c78c5d6c89f5fd19a
parent 7bda5b79f41b8321e3da9d83815fe25d649c6a54

Bionic libs are located at /system/lib
am: 3fa8415b37

Change-Id: I99d0bb578edc0bf95ed4c4d7007d0862915b3c9a

libunwindstack/DexFile.cpp

diff --git a/libunwindstack/DexFile.cpp b/libunwindstack/DexFile.cpp
index 9b0b232..eaf867f 100644
--- a/libunwindstack/DexFile.cpp
+++ b/libunwindstack/DexFile.cpp
@@ -23,7 +23,7 @@
 #include <memory>
 
 #include <android-base/unique_fd.h>
-#include <art_api/ext_dex_file.h>
+#include <art_api/dex_file_support.h>
 
 #include <unwindstack/MapInfo.h>
 #include <unwindstack/Memory.h>
@@ -46,7 +46,7 @@
 
 bool DexFile::GetMethodInformation(uint64_t dex_offset, std::string* method_name,
                                    uint64_t* method_offset) {
-  art_api::dex::MethodInfo method_info = GetMethodInfoForOffset(dex_offset);
+  art_api::dex::MethodInfo method_info = GetMethodInfoForOffset(dex_offset, false);
   if (method_info.offset == 0) {
     return false;
   }

libunwindstack/DexFile.h

diff --git a/libunwindstack/DexFile.h b/libunwindstack/DexFile.h
index 5797dee..ca658e6 100644
--- a/libunwindstack/DexFile.h
+++ b/libunwindstack/DexFile.h
@@ -25,7 +25,7 @@
 #include <utility>
 #include <vector>
 
-#include <art_api/ext_dex_file.h>
+#include <art_api/dex_file_support.h>
 
 namespace unwindstack {