diff options
author | 2024-11-08 20:00:48 +0000 | |
---|---|---|
committer | 2024-11-08 20:00:48 +0000 | |
commit | 28c8e155fd3f8dc9c133f435b89af4288b4435f7 (patch) | |
tree | 2d22e341385e7a4cd623cda9c051ff33751df625 /libs/ui/Gralloc5.cpp | |
parent | 87602161374f8dcede06e7280f267f77c2bee3c5 (diff) | |
parent | 5e66590c7493d5bab7d3a93b40d582c005e63b16 (diff) |
Merge changes from topic "revert-3334193-no-llndk-versioning-YOLDNTJGYM" into main am: 7ef014b3dd am: 5e66590c74
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3341364
Change-Id: I2e0dd884846ad45dd17a7859d9ecf421da58d18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/ui/Gralloc5.cpp')
-rw-r--r-- | libs/ui/Gralloc5.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ui/Gralloc5.cpp b/libs/ui/Gralloc5.cpp index 2143f79f11..c9ec036186 100644 --- a/libs/ui/Gralloc5.cpp +++ b/libs/ui/Gralloc5.cpp @@ -23,6 +23,7 @@ #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> @@ -90,7 +91,7 @@ static void *loadIMapperLibrary() { } void* so = nullptr; - if (__builtin_available(android __ANDROID_API_V__, *)) { + if API_LEVEL_AT_LEAST (__ANDROID_API_V__, 202404) { so = AServiceManager_openDeclaredPassthroughHal("mapper", mapperSuffix.c_str(), RTLD_LOCAL | RTLD_NOW); } else { |