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

Commit 52e9ebfa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use new API to load mapper" into main am: 6a5da150 

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



Change-Id: If9bc9393e42d5af792d04fabda945c2bb1a5a028
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9705248d 6a5da150

graphics/mapper/stable-c/vts/VtsHalGraphicsMapperStableC_TargetTest.cpp

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