diff options
| author | 2021-10-11 19:09:00 -0700 | |
|---|---|---|
| committer | 2021-10-26 17:36:32 +0000 | |
| commit | 9c924e89e5f52da9faadd1e4e60c73eaed6bc9d1 (patch) | |
| tree | 8ffdc7f0c144cb392b50144a9ae9cb4ac4d3cca7 /runtime/common_runtime_test.cc | |
| parent | d690f8ae8f8e2675bc52089a83ac18c749f8e6d2 (diff) | |
Add support to place shared libraries after the dex path
This allows for a shared library to overriden by content in the dex path
Bug: 179429740
Test: m test-art-host-gtest-art_runtime_tests32
Change-Id: I5f69c7bf32b7bd389eff8bdbb21616ba89ed9e87
Diffstat (limited to 'runtime/common_runtime_test.cc')
| -rw-r--r-- | runtime/common_runtime_test.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc index b748e37917..4eb34083d1 100644 --- a/runtime/common_runtime_test.cc +++ b/runtime/common_runtime_test.cc @@ -255,7 +255,8 @@ jobject CommonRuntimeTestImpl::LoadDexInWellKnownClassLoader(const std::vector<std::string>& dex_names, jclass loader_class, jobject parent_loader, - jobject shared_libraries) { + jobject shared_libraries, + jobject shared_libraries_after) { std::vector<const DexFile*> class_path; for (const std::string& dex_name : dex_names) { std::vector<std::unique_ptr<const DexFile>> dex_files = OpenTestDexFiles(dex_name.c_str()); @@ -273,7 +274,8 @@ CommonRuntimeTestImpl::LoadDexInWellKnownClassLoader(const std::vector<std::stri class_path, loader_class, parent_loader, - shared_libraries); + shared_libraries, + shared_libraries_after); { // Verify we build the correct chain. @@ -301,19 +303,23 @@ CommonRuntimeTestImpl::LoadDexInWellKnownClassLoader(const std::vector<std::stri jobject CommonRuntimeTestImpl::LoadDexInPathClassLoader(const std::string& dex_name, jobject parent_loader, - jobject shared_libraries) { + jobject shared_libraries, + jobject shared_libraries_after) { return LoadDexInPathClassLoader(std::vector<std::string>{ dex_name }, parent_loader, - shared_libraries); + shared_libraries, + shared_libraries_after); } jobject CommonRuntimeTestImpl::LoadDexInPathClassLoader(const std::vector<std::string>& names, jobject parent_loader, - jobject shared_libraries) { + jobject shared_libraries, + jobject shared_libraries_after) { return LoadDexInWellKnownClassLoader(names, WellKnownClasses::dalvik_system_PathClassLoader, parent_loader, - shared_libraries); + shared_libraries, + shared_libraries_after); } jobject CommonRuntimeTestImpl::LoadDexInDelegateLastClassLoader(const std::string& dex_name, |