| commit | c1e4f6ede3c28efa0c28d2fc3acc44b29adebd4f | [log] [tgz] |
|---|---|---|
| author | Jooyung Han <jooyung@google.com> | Wed Feb 14 22:59:48 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 14 22:59:48 2024 +0000 |
| tree | f4d43b5c94282474e3d862f03e4444c95f32fc0d | |
| parent | 52e9ebfa9147fe51aeacadc0b9519bb7fe29e025 [diff] | |
| parent | f6b4016c32ae13d517899c79ae71ceb466a16848 [diff] |
Merge "Use new API to load mapper" into main am: f6b4016c32 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2963302 Change-Id: I62e056a3c0ed6a4ac130fae5c01ee455b0da061e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/graphics/allocator/aidl/vts/VtsHalGraphicsAllocatorAidl_TargetTest.cpp b/graphics/allocator/aidl/vts/VtsHalGraphicsAllocatorAidl_TargetTest.cpp index 4778020..0430ea7 100644 --- a/graphics/allocator/aidl/vts/VtsHalGraphicsAllocatorAidl_TargetTest.cpp +++ b/graphics/allocator/aidl/vts/VtsHalGraphicsAllocatorAidl_TargetTest.cpp
@@ -144,7 +144,8 @@ auto status = mAllocator->getIMapperLibrarySuffix(&mapperSuffix); ASSERT_TRUE(status.isOk()); std::string lib_name = "mapper." + mapperSuffix + ".so"; - void* so = android_load_sphal_library(lib_name.c_str(), RTLD_LOCAL | RTLD_NOW); + void* so = AServiceManager_openDeclaredPassthroughHal("mapper", mapperSuffix.c_str(), + RTLD_LOCAL | RTLD_NOW); ASSERT_NE(nullptr, so) << "Failed to load " << lib_name; auto loadIMapper = (AIMapper_loadIMapperFn)dlsym(so, "AIMapper_loadIMapper"); ASSERT_NE(nullptr, loadIMapper) << "AIMapper_locaIMapper missing from " << lib_name;