commit a52cd7e0a293637f11064462937c18be84a4fe35
author Jooyung Han <jooyung@google.com> Tue Nov 05 13:44:24 2024 +0900
committer Jooyung Han <jooyung@google.com> Wed Nov 06 15:41:13 2024 +0900
tree 3e5bd422e0dc6d48ff526c79242d78e72cedd34e
parent e57dca0191097d5d2b521ff617e3527e1cfed9c3

Use __builtin_available guard

Bug: 362658565
Test: m
Change-Id: I2fa5d366b591afa878f62ba39f2831e48a6df5cd

libs/ui/Gralloc5.cpp

diff --git a/libs/ui/Gralloc5.cpp b/libs/ui/Gralloc5.cpp
index c9ec036..2143f79 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 @@
         }
 
         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 {