diff options
| author | 2015-04-25 01:42:27 +0000 | |
|---|---|---|
| committer | 2015-04-25 01:42:27 +0000 | |
| commit | 0965ce8fa35b487bbf36bbfb7bed795e9547f647 (patch) | |
| tree | 347bd14890a81298fedf0ba97769077b9ef3d57f /runtime/class_linker.h | |
| parent | 3856df46f8ceb741b39dd40392b9485b47c35a54 (diff) | |
| parent | 6e655afb37a528cfd90aa702b1600e1eb5d10a58 (diff) | |
am 6e655afb: Merge "ART: Check for duplicate classes when loading oat files"
* commit '6e655afb37a528cfd90aa702b1600e1eb5d10a58':
ART: Check for duplicate classes when loading oat files
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index 1bd9f0a7e9..57989b272b 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -663,6 +663,9 @@ class ClassLinker { // a recreation with a custom string. void ThrowEarlierClassFailure(mirror::Class* c) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + // Check for duplicate class definitions of the given oat file against all open oat files. + bool HasCollisions(const OatFile* oat_file, std::string* error_msg) LOCKS_EXCLUDED(dex_lock_); + std::vector<const DexFile*> boot_class_path_; std::vector<std::unique_ptr<const DexFile>> opened_dex_files_; |