diff options
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index d1c8172630..f6ce545a19 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -255,7 +255,7 @@ class ClassLinker { SHARED_REQUIRES(Locks::mutator_lock_); // Resolve a Type with the given index from the DexFile, storing the - // result in the DexCache. The referrer is used to identity the + // result in the DexCache. The referrer is used to identify the // target DexCache and ClassLoader to use for resolution. mirror::Class* ResolveType(const DexFile& dex_file, uint16_t type_idx, mirror::Class* referrer) SHARED_REQUIRES(Locks::mutator_lock_) @@ -560,7 +560,7 @@ class ClassLinker { // Creates a GlobalRef PathClassLoader that can be used to load classes from the given dex files. // Note: the objects are not completely set up. Do not use this outside of tests and the compiler. - jobject CreatePathClassLoader(Thread* self, std::vector<const DexFile*>& dex_files) + jobject CreatePathClassLoader(Thread* self, const std::vector<const DexFile*>& dex_files) SHARED_REQUIRES(Locks::mutator_lock_) REQUIRES(!dex_lock_); @@ -611,6 +611,10 @@ class ClassLinker { const std::set<DexCacheResolvedClasses>& classes) REQUIRES(!dex_lock_); + static bool IsBootClassLoader(ScopedObjectAccessAlreadyRunnable& soa, + mirror::ClassLoader* class_loader) + SHARED_REQUIRES(Locks::mutator_lock_); + ArtMethod* AddMethodToConflictTable(mirror::Class* klass, ArtMethod* conflict_method, ArtMethod* interface_method, |