diff options
| author | 2018-11-28 16:06:12 +0000 | |
|---|---|---|
| committer | 2018-11-29 17:16:04 +0000 | |
| commit | a66d69e884b6f9f41a8da31e6d27b498984c7fa3 (patch) | |
| tree | 58efae80d2b2161feff23143ab620242d1c09605 /runtime/common_runtime_test.cc | |
| 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/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 fcf6bb25e3..6d21f15c7a 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, |