| commit | 4a6f517afd727deb976c675d7798d69acba8f752 | [log] [tgz] |
|---|---|---|
| author | Jooyung Han <jooyung@google.com> | Wed Feb 14 23:38:35 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 14 23:38:35 2024 +0000 |
| tree | 0038c69bc8164b2a4a3cc19cc1f4bddf3de07f7f | |
| parent | 63143aa816c434eb73d2215314bc2202a6e57ba8 [diff] | |
| parent | c1e4f6ede3c28efa0c28d2fc3acc44b29adebd4f [diff] |
Merge "Use new API to load mapper" into main am: f6b4016c32 am: c1e4f6ede3 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2963302 Change-Id: Ic1d942011cd9745f75850dc3482cb435eb29496c 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;