diff options
author | 2018-11-30 01:09:49 +0000 | |
---|---|---|
committer | 2018-11-30 19:09:57 +0000 | |
commit | e16727388a0a2aedae530f686c0fd95cd2bbb80f (patch) | |
tree | a35bc53fd844f5037b572fe862d9178d83fce5ad /runtime/class_loader_context.h | |
parent | 458128737485d72028d0e4af9855b7773c81010b (diff) |
Revert^2 "Support shared libraries in CreateContextFromClassLoader."
This reverts commit 1717a493a4a0c1c3b69ecfcb58838627b4c75878.
bug: 120036590
bug: 120031686
Reason for revert: Fix code to ensure ownership of dex files.
Change-Id: I99fffb52b73e0a41d779a41605ddf2e9249c02e0
Diffstat (limited to 'runtime/class_loader_context.h')
-rw-r--r-- | runtime/class_loader_context.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/runtime/class_loader_context.h b/runtime/class_loader_context.h index 71f40ac167..5a89c4e95f 100644 --- a/runtime/class_loader_context.h +++ b/runtime/class_loader_context.h @@ -227,12 +227,14 @@ class ClassLoaderContext { // of the call. void CheckDexFilesOpened(const std::string& calling_method) const; - // Adds the `class_loader` info to the context. + // Creates the `ClassLoaderInfo` representing`class_loader` and attach it to `this`. // The dex file present in `dex_elements` array (if not null) will be added at the end of // the classpath. - bool AddInfoToContextFromClassLoader(ScopedObjectAccessAlreadyRunnable& soa, - Handle<mirror::ClassLoader> class_loader, - Handle<mirror::ObjectArray<mirror::Object>> dex_elements) + bool CreateInfoFromClassLoader(ScopedObjectAccessAlreadyRunnable& soa, + Handle<mirror::ClassLoader> class_loader, + Handle<mirror::ObjectArray<mirror::Object>> dex_elements, + ClassLoaderInfo* child_info, + bool is_shared_library) REQUIRES_SHARED(Locks::mutator_lock_); // Encodes the context as a string suitable to be passed to dex2oat or to be added to the |