diff options
| author | 2022-11-23 14:24:45 +0000 | |
|---|---|---|
| committer | 2022-11-29 08:41:31 +0000 | |
| commit | b6f965d2967c77cdf8f4bff26b838ee6a5ca6d1a (patch) | |
| tree | d66a451156965da02d8374e4658a21f5d542d304 /runtime/common_runtime_test.h | |
| parent | e22e84bd127520b33d56bf0ad62aa2b99be06de3 (diff) | |
Change well known class loader methods to `ArtMethod*`.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: atest CtsJdwpTestCases
Change-Id: I7b94a481304f8899bcb828ed5875fe165dd90dda
Diffstat (limited to 'runtime/common_runtime_test.h')
| -rw-r--r-- | runtime/common_runtime_test.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h index 1b69c32b76..7904aeb086 100644 --- a/runtime/common_runtime_test.h +++ b/runtime/common_runtime_test.h @@ -152,6 +152,7 @@ class CommonRuntimeTestImpl : public CommonArtTestImpl { jobject LoadMultiDex(const char* first_dex_name, const char* second_dex_name) REQUIRES_SHARED(Locks::mutator_lock_); + // The following helper functions return global JNI references to the class loader. jobject LoadDexInPathClassLoader(const std::string& dex_name, jobject parent_loader, jobject shared_libraries = nullptr, @@ -162,11 +163,13 @@ class CommonRuntimeTestImpl : public CommonArtTestImpl { jobject shared_libraries_after = nullptr); jobject LoadDexInDelegateLastClassLoader(const std::string& dex_name, jobject parent_loader); jobject LoadDexInInMemoryDexClassLoader(const std::string& dex_name, jobject parent_loader); - jobject LoadDexInWellKnownClassLoader(const std::vector<std::string>& dex_names, - jclass loader_class, + jobject LoadDexInWellKnownClassLoader(ScopedObjectAccess& soa, + const std::vector<std::string>& dex_names, + ObjPtr<mirror::Class> loader_class, jobject parent_loader, jobject shared_libraries = nullptr, - jobject shared_libraries_after = nullptr); + jobject shared_libraries_after = nullptr) + REQUIRES_SHARED(Locks::mutator_lock_); void VisitDexes(ArrayRef<const std::string> dexes, const std::function<void(MethodReference)>& method_visitor, |