diff options
| author | 2024-11-12 01:52:53 +0000 | |
|---|---|---|
| committer | 2024-11-12 01:52:53 +0000 | |
| commit | a5dfed1507bf72e63551a7404ca7108befab4c44 (patch) | |
| tree | c9fc6d8debbc8603078e1d7a481304f02025cfd6 | |
| parent | d8bfaae9799ecafe6f3f4f39d282de0666c987db (diff) | |
| parent | 59fc51c6dceae5b8cbae0a548e693df7aeda904f (diff) | |
Revert^2 "Use __builtin_available guard" am: 59fc51c6dc
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3342060
Change-Id: I3574c19d257f52094c70106ab64b3895e004ca0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/ui/Gralloc5.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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 { |