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

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

Revert^2 "Use __builtin_available guard" am: 59fc51c6 am: a5dfed15 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3342060



Change-Id: Id367b9f72b4be29d1b0c706f0a67f501389ef15a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7959a20a a5dfed15

libs/ui/Gralloc5.cpp

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <aidlcommonsupport/NativeHandle.h>

#include <android/binder_manager.h>

#include <android/hardware/graphics/mapper/utils/IMapperMetadataTypes.h>

#include <android/llndk-versioning.h>

#include <binder/IPCThreadState.h>

#include <dlfcn.h>

#include <ui/FatVector.h>
@@ -91,7 +90,7 @@ static void *loadIMapperLibrary() { 
        }



        void* so = nullptr;

        if API_LEVEL_AT_LEAST (__ANDROID_API_V__, 202404) {

        if (__builtin_available(android __ANDROID_API_V__, *)) {

            so = AServiceManager_openDeclaredPassthroughHal("mapper", mapperSuffix.c_str(),

                                                            RTLD_LOCAL | RTLD_NOW);

        } else {