Skip to content

Commit 617f848

Browse files
Jooyung Hanandroid-build-merge-worker-robot
authored andcommitted
Use __builtin_available guard am: a52cd7e am: ffd8037
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3333893 Change-Id: Ifad1080e1f2f408279ffe34f42c70b1373937587 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 parents 7baf9df + ffd8037 commit 617f848

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

libs/ui/Gralloc5.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <aidlcommonsupport/NativeHandle.h>
2424
#include <android/binder_manager.h>
2525
#include <android/hardware/graphics/mapper/utils/IMapperMetadataTypes.h>
26-
#include <android/llndk-versioning.h>
2726
#include <binder/IPCThreadState.h>
2827
#include <dlfcn.h>
2928
#include <ui/FatVector.h>
@@ -91,7 +90,7 @@ static void *loadIMapperLibrary() {
9190
}
9291

9392
void* so = nullptr;
94-
if API_LEVEL_AT_LEAST (__ANDROID_API_V__, 202404) {
93+
if (__builtin_available(android __ANDROID_API_V__, *)) {
9594
so = AServiceManager_openDeclaredPassthroughHal("mapper", mapperSuffix.c_str(),
9695
RTLD_LOCAL | RTLD_NOW);
9796
} else {

0 commit comments

Comments
 (0)