diff options
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index d1f5aa0ec3..0248a219be 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -549,14 +549,15 @@ class ClassLinker { } mirror::DexCache* GetDexCache(size_t idx) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_, dex_lock_); - const OatFile* FindOpenedOatFileForDexFile(const DexFile& dex_file) + const OatFile::OatDexFile* FindOpenedOatDexFileForDexFile(const DexFile& dex_file) LOCKS_EXCLUDED(dex_lock_) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - // Find an opened oat file that contains dex_location. If oat_location is not nullptr, the file - // must have that location, else any oat location is accepted. - const OatFile* FindOpenedOatFile(const char* oat_location, const char* dex_location, - const uint32_t* const dex_location_checksum) + // Find an opened oat dex file that contains dex_location. If oat_location is not nullptr, + // the file must have that location, else any oat location is accepted. + const OatFile::OatDexFile* FindOpenedOatDexFile(const char* oat_location, + const char* dex_location, + const uint32_t* dex_location_checksum) LOCKS_EXCLUDED(dex_lock_); // Will open the oat file directly without relocating, even if we could/should do relocation. @@ -606,8 +607,8 @@ class ClassLinker { // Note 1: this will not check open oat files, which are assumed to be stale when this is run. // Note 2: Does not register the oat file. It is the caller's job to register if the file is to // be kept. - const OatFile* FindOatFileContainingDexFileFromDexLocation(const char* location, - const uint32_t* const location_checksum, + const OatFile* FindOatFileContainingDexFileFromDexLocation(const char* dex_location, + const uint32_t* dex_location_checksum, InstructionSet isa, std::vector<std::string>* error_msgs, bool* obsolete_file_cleanup_failed) |