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 /runtime/gc | |
| 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 'runtime/gc')
| -rw-r--r-- | runtime/gc/space/image_space.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc index 14f770d..1fb3252 100644 --- a/runtime/gc/space/image_space.cc +++ b/runtime/gc/space/image_space.cc @@ -788,7 +788,8 @@ OatFile* ImageSpace::OpenOatFile(const char* image_path, std::string* error_msg) OatFile* oat_file = OatFile::Open(oat_filename, oat_filename, image_header.GetOatDataBegin(), image_header.GetOatFileBegin(), - !Runtime::Current()->IsAotCompiler(), error_msg); + !Runtime::Current()->IsAotCompiler(), + nullptr, error_msg); if (oat_file == NULL) { *error_msg = StringPrintf("Failed to open oat file '%s' referenced from image %s: %s", oat_filename.c_str(), GetName(), error_msg->c_str()); |