diff options
| author | 2018-11-30 01:03:10 +0000 | |
|---|---|---|
| committer | 2018-11-30 01:03:10 +0000 | |
| commit | 458128737485d72028d0e4af9855b7773c81010b (patch) | |
| tree | 74b5b23be9f71018e396b37e3ba7aa190ef7a72a /runtime/common_runtime_test.cc | |
| parent | d5ae80c223a2aa51b6a54faa0f014acdd013103f (diff) | |
| parent | 1717a493a4a0c1c3b69ecfcb58838627b4c75878 (diff) | |
Merge "Revert "Support shared libraries in CreateContextFromClassLoader.""
Diffstat (limited to 'runtime/common_runtime_test.cc')
| -rw-r--r-- | runtime/common_runtime_test.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc index 0300fa155f..7388c2e307 100644 --- a/runtime/common_runtime_test.cc +++ b/runtime/common_runtime_test.cc @@ -273,8 +273,7 @@ jobject CommonRuntimeTestImpl::LoadDex(const char* dex_name) { jobject CommonRuntimeTestImpl::LoadDexInWellKnownClassLoader(const std::string& dex_name, jclass loader_class, - jobject parent_loader, - jobject shared_libraries) { + jobject parent_loader) { 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()); @@ -289,8 +288,7 @@ jobject CommonRuntimeTestImpl::LoadDexInWellKnownClassLoader(const std::string& self, class_path, loader_class, - parent_loader, - shared_libraries); + parent_loader); { // Verify we build the correct chain. @@ -317,12 +315,10 @@ jobject CommonRuntimeTestImpl::LoadDexInWellKnownClassLoader(const std::string& } jobject CommonRuntimeTestImpl::LoadDexInPathClassLoader(const std::string& dex_name, - jobject parent_loader, - jobject shared_libraries) { + jobject parent_loader) { return LoadDexInWellKnownClassLoader(dex_name, WellKnownClasses::dalvik_system_PathClassLoader, - parent_loader, - shared_libraries); + parent_loader); } jobject CommonRuntimeTestImpl::LoadDexInDelegateLastClassLoader(const std::string& dex_name, |