diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-14 17:44:28 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-05-16 16:14:50 -0700 |
| commit | 0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53 (patch) | |
| tree | aba31f1d671b4816fb63fca00b985ab0d2b6a12b /runtime/class_linker.cc | |
| parent | de1129a26e0474ea8bb9112938ebb867163969fd (diff) | |
| download | art-0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53.zip art-0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53.tar.gz art-0e12bdc49744eb6d5c29b9611a8dbe10bac4cd53.tar.bz2 | |
Add ISA directory to image and odex pathnames.
Bug: 14882223
Bug: 14694978
Change-Id: Ic1b5ae836b8e91ea461dcd4f3da8e38dc3bec00f
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 6b98da9..54532b4 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -552,7 +552,7 @@ bool ClassLinker::GenerateOatFile(const char* dex_filename, gc::Heap* heap = Runtime::Current()->GetHeap(); std::string boot_image_option("--boot-image="); - boot_image_option += heap->GetImageSpace()->GetImageFilename(); + boot_image_option += heap->GetImageSpace()->GetImageLocation(); std::string dex_file_option("--dex-file="); dex_file_option += dex_filename; @@ -910,6 +910,7 @@ const DexFile* ClassLinker::VerifyAndOpenDexFileFromOatFile(const std::string& o const DexFile* ClassLinker::FindDexFileInOatFileFromDexLocation(const char* dex_location, const uint32_t* const dex_location_checksum, + InstructionSet isa, std::vector<std::string>* error_msgs) { const OatFile* open_oat_file = FindOpenedOatFileFromDexLocation(dex_location, dex_location_checksum); @@ -925,8 +926,8 @@ const DexFile* ClassLinker::FindDexFileInOatFileFromDexLocation(const char* dex_ } // Look for an existing file next to dex. for example, for - // /foo/bar/baz.jar, look for /foo/bar/baz.odex. - std::string odex_filename(OatFile::DexFilenameToOdexFilename(dex_location)); + // /foo/bar/baz.jar, look for /foo/bar/<isa>/baz.odex. + std::string odex_filename(DexFilenameToOdexFilename(dex_location, isa)); bool open_failed; std::string error_msg; const DexFile* dex_file = VerifyAndOpenDexFileFromOatFile(odex_filename, dex_location, |