Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99d86159 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by android-build-merger
Browse files

Merge "Some minor updates in the libdexfile external API." am: 810c57d6 

am: 729f8be9

Change-Id: I3f5dea5f12ce3ffd6debb5f9a9fabacfb8cb9c8f
parents af8cc6be 729f8be9

libunwindstack/DexFile.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ std::unique_ptr<DexFile> DexFile::Create(uint64_t dex_file_offset_in_memory, Mem 


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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <utility>

#include <vector>



#include <art_api/ext_dex_file.h>

#include <art_api/dex_file_support.h>



namespace unwindstack {