diff options
| author | Richard Uhler <ruhler@google.com> | 2015-03-25 17:10:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-25 17:10:12 +0000 |
| commit | 3679a47027b40290018d0ccc50b996a15645dfef (patch) | |
| tree | 92c6fcbb8fe5c647eb06bb63277c90f36c319101 /oatdump | |
| parent | 139cec015abd195727d5410dc313b483babeda10 (diff) | |
| parent | e5fed03772144595c0904faf3d6974cc55214c8c (diff) | |
| download | art-3679a47027b40290018d0ccc50b996a15645dfef.zip art-3679a47027b40290018d0ccc50b996a15645dfef.tar.gz art-3679a47027b40290018d0ccc50b996a15645dfef.tar.bz2 | |
Merge "Support relative encoded dex locations in oat files."
Diffstat (limited to 'oatdump')
| -rw-r--r-- | oatdump/oatdump.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc index 14bcd4b..daca971 100644 --- a/oatdump/oatdump.cc +++ b/oatdump/oatdump.cc @@ -1453,7 +1453,9 @@ class ImageDumper { std::string error_msg; const OatFile* oat_file = class_linker->FindOpenedOatFileFromOatLocation(oat_location); if (oat_file == nullptr) { - oat_file = OatFile::Open(oat_location, oat_location, nullptr, nullptr, false, &error_msg); + oat_file = OatFile::Open(oat_location, oat_location, + nullptr, nullptr, false, nullptr, + &error_msg); if (oat_file == nullptr) { os << "NOT FOUND: " << error_msg << "\n"; return false; @@ -2193,7 +2195,7 @@ static int DumpOat(Runtime* runtime, const char* oat_filename, OatDumperOptions* std::ostream* os) { std::string error_msg; OatFile* oat_file = OatFile::Open(oat_filename, oat_filename, nullptr, nullptr, false, - &error_msg); + nullptr, &error_msg); if (oat_file == nullptr) { fprintf(stderr, "Failed to open oat file from '%s': %s\n", oat_filename, error_msg.c_str()); return EXIT_FAILURE; @@ -2209,7 +2211,7 @@ static int DumpOat(Runtime* runtime, const char* oat_filename, OatDumperOptions* static int SymbolizeOat(const char* oat_filename, std::string& output_name) { std::string error_msg; OatFile* oat_file = OatFile::Open(oat_filename, oat_filename, nullptr, nullptr, false, - &error_msg); + nullptr, &error_msg); if (oat_file == nullptr) { fprintf(stderr, "Failed to open oat file from '%s': %s\n", oat_filename, error_msg.c_str()); return EXIT_FAILURE; |