diff options
| author | 2018-11-28 16:06:12 +0000 | |
|---|---|---|
| committer | 2018-11-29 17:16:04 +0000 | |
| commit | a66d69e884b6f9f41a8da31e6d27b498984c7fa3 (patch) | |
| tree | 58efae80d2b2161feff23143ab620242d1c09605 /runtime/class_linker.h | |
| parent | 8f50b2c27f9b32726bbadfcebba910640b94036e (diff) | |
Support shared libraries in CreateContextFromClassLoader.
Missed this method in my previous set of shared libraries support.
bug: 120036590
bug: 120031686
Test: test.py, app startup with speed-profile
Change-Id: I5c1ec567cfa5452a1f510a3279a9e15125f429ba
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index 15a7204dd2..dd5f911330 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -574,7 +574,8 @@ class ClassLinker { jobject CreateWellKnownClassLoader(Thread* self, const std::vector<const DexFile*>& dex_files, jclass loader_class, - jobject parent_loader) + jobject parent_loader, + jobject shared_libraries = nullptr) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Locks::dex_lock_); @@ -591,8 +592,8 @@ class ClassLinker { Thread* self, const std::vector<const DexFile*>& dex_files, Handle<mirror::Class> loader_class, - Handle<mirror::ObjectArray<mirror::ClassLoader>> shared_libraries, - Handle<mirror::ClassLoader> parent_loader) + Handle<mirror::ClassLoader> parent_loader, + Handle<mirror::ObjectArray<mirror::ClassLoader>> shared_libraries) REQUIRES_SHARED(Locks::mutator_lock_) REQUIRES(!Locks::dex_lock_); |