commit e16727388a0a2aedae530f686c0fd95cd2bbb80f
author Nicolas Geoffray <ngeoffray@google.com> Fri Nov 30 01:09:49 2018 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Nov 30 19:09:57 2018 +0000
tree a35bc53fd844f5037b572fe862d9178d83fce5ad
parent 458128737485d72028d0e4af9855b7773c81010b

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

runtime/common_runtime_test.h

diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h
index c48ab36..0fee797 100644
--- a/runtime/common_runtime_test.h
+++ b/runtime/common_runtime_test.h
@@ -115,11 +115,14 @@
   jobject LoadMultiDex(const char* first_dex_name, const char* second_dex_name)
       REQUIRES_SHARED(Locks::mutator_lock_);
 
-  jobject LoadDexInPathClassLoader(const std::string& dex_name, jobject parent_loader);
+  jobject LoadDexInPathClassLoader(const std::string& dex_name,
+                                   jobject parent_loader,
+                                   jobject shared_libraries = nullptr);
   jobject LoadDexInDelegateLastClassLoader(const std::string& dex_name, jobject parent_loader);
   jobject LoadDexInWellKnownClassLoader(const std::string& dex_name,
                                         jclass loader_class,
-                                        jobject parent_loader);
+                                        jobject parent_loader,
+                                        jobject shared_libraries = nullptr);
 
   std::unique_ptr<Runtime> runtime_;