diff options
| author | 2018-11-30 01:09:49 +0000 | |
|---|---|---|
| committer | 2018-11-30 19:09:57 +0000 | |
| commit | e16727388a0a2aedae530f686c0fd95cd2bbb80f (patch) | |
| tree | a35bc53fd844f5037b572fe862d9178d83fce5ad /runtime/common_runtime_test.cc | |
| 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/common_runtime_test.cc')
| -rw-r--r-- | runtime/common_runtime_test.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc index 7388c2e307..0300fa155f 100644 --- a/runtime/common_runtime_test.cc +++ b/runtime/common_runtime_test.cc @@ -273,7 +273,8 @@ jobject CommonRuntimeTestImpl::LoadDex(const char* dex_name) { jobject CommonRuntimeTestImpl::LoadDexInWellKnownClassLoader(const std::string& dex_name, jclass loader_class, - jobject parent_loader) { + jobject parent_loader, + jobject shared_libraries) { std::vector<std::unique_ptr<const DexFile>> dex_files = OpenTestDexFiles(dex_name.c_str()); std::vector<const DexFile*> class_path; CHECK_NE(0U, dex_files.size()); @@ -288,7 +289,8 @@ jobject CommonRuntimeTestImpl::LoadDexInWellKnownClassLoader(const std::string& self, class_path, loader_class, - parent_loader); + parent_loader, + shared_libraries); { // Verify we build the correct chain. @@ -315,10 +317,12 @@ jobject CommonRuntimeTestImpl::LoadDexInWellKnownClassLoader(const std::string& } jobject CommonRuntimeTestImpl::LoadDexInPathClassLoader(const std::string& dex_name, - jobject parent_loader) { + jobject parent_loader, + jobject shared_libraries) { return LoadDexInWellKnownClassLoader(dex_name, WellKnownClasses::dalvik_system_PathClassLoader, - parent_loader); + parent_loader, + shared_libraries); } jobject CommonRuntimeTestImpl::LoadDexInDelegateLastClassLoader(const std::string& dex_name, |