From 59fc51c6dceae5b8cbae0a548e693df7aeda904f Mon Sep 17 00:00:00 2001
From: Jooyung Han <jooyung@google.com>
Date: Sat, 9 Nov 2024 02:41:06 +0000
Subject: Revert^2 "Use __builtin_available guard"

0034aef56f2ece07055bb4955a32df389a0334bc

Change-Id: I963afc7425e38bc6b7bdbacc262e89f4d5b16f72
---
 libs/ui/Gralloc5.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'libs/ui/Gralloc5.cpp')

diff --git a/libs/ui/Gralloc5.cpp b/libs/ui/Gralloc5.cpp
index c9ec036186..2143f79f11 100644
--- a/libs/ui/Gralloc5.cpp
+++ b/libs/ui/Gralloc5.cpp
@@ -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 {
-- 
cgit v1.2.3-59-g8ed1b