Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a6f517a authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Use new API to load mapper" into main am: f6b4016c am: c1e4f6ed 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2963302



Change-Id: Ic1d942011cd9745f75850dc3482cb435eb29496c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 63143aa8 c1e4f6ed

graphics/allocator/aidl/vts/VtsHalGraphicsAllocatorAidl_TargetTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -144,7 +144,8 @@ class GraphicsTestsBase { 
            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;