diff options
| author | 2024-11-08 06:29:05 +0000 | |
|---|---|---|
| committer | 2024-11-08 06:29:05 +0000 | |
| commit | 33a0c3ca1f33c2c02c21d13649bb83b46b239d2d (patch) | |
| tree | e270dbda17eafe7c2c14fa15870744cd70b7e1c6 /libs/ui/Gralloc5.cpp | |
| parent | 30a4c27daa652a77c54720f65bccc9692a7f9489 (diff) | |
| parent | 8fdf7eb239a4c6173067ecf36f5208cc1ff37268 (diff) | |
Merge changes from topic "no-llndk-versioning" into main
* changes:
Deprecating llndk-versioning.h
Use __builtin_available guard
Diffstat (limited to 'libs/ui/Gralloc5.cpp')
| -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 { |