| commit | 446813dff618365ecffbbe229b4e0f63645e98a9 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Feb 14 02:11:58 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 14 02:11:58 2024 +0000 |
| tree | 782ca62db03659c9c37fd359aedbf5c61f6014fd | |
| parent | 1fdd38f48ea6deb733d00e5a4fe36f4b9a1c2084 [diff] | |
| parent | 52e9ebfa9147fe51aeacadc0b9519bb7fe29e025 [diff] |
Merge "Use new API to load mapper" into main am: 6a5da15033 am: 52e9ebfa91 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2960862 Change-Id: I42b3f655502f96e3b84518a666fd5b28353b98bd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/graphics/mapper/stable-c/vts/VtsHalGraphicsMapperStableC_TargetTest.cpp b/graphics/mapper/stable-c/vts/VtsHalGraphicsMapperStableC_TargetTest.cpp index b329de2..1e0c427 100644 --- a/graphics/mapper/stable-c/vts/VtsHalGraphicsMapperStableC_TargetTest.cpp +++ b/graphics/mapper/stable-c/vts/VtsHalGraphicsMapperStableC_TargetTest.cpp
@@ -166,7 +166,8 @@ auto status = mAllocator->getIMapperLibrarySuffix(&mapperSuffix); ASSERT_TRUE(status.isOk()) << "Failed to get IMapper library suffix"; 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; mIMapperLoader = (AIMapper_loadIMapperFn)dlsym(so, "AIMapper_loadIMapper"); ASSERT_NE(nullptr, mIMapperLoader) << "AIMapper_locaIMapper missing from " << lib_name;