commit f16514af8c290f946d1e7a804404a753d4fe12b0
author Martin Stjernholm <mast@google.com> Fri Jan 11 02:46:49 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Jan 11 02:46:49 2019 -0800
tree ef12c99222834b94fbf823dea26ef90f06289834
parent f4d1064883981d381a688a0ffbbb0dc896b652cb
parent a91a6ae6006e3ca3fcf283bb76dd279a4aaa03c6

Merge "Some minor updates in the libdexfile external API." am: 810c57d610
am: 729f8be991

Change-Id: I3f5dea5f12ce3ffd6debb5f9a9fabacfb8cb9c8f

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 {