diff options
| author | 2024-11-08 19:36:30 +0000 | |
|---|---|---|
| committer | 2024-11-08 19:36:30 +0000 | |
| commit | 5e66590c7493d5bab7d3a93b40d582c005e63b16 (patch) | |
| tree | 91e1204dc2b19e626b0974d95e685a0f8a93978c /libs/ui/Gralloc5.cpp | |
| parent | 46327a4b053ae24bbd0ac5e11d61177036d966bb (diff) | |
| parent | 7ef014b3ddb5ddb9b08c13cb0fd0ce6f7913d142 (diff) | |
Merge changes from topic "revert-3334193-no-llndk-versioning-YOLDNTJGYM" into main am: 7ef014b3dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3341364
Change-Id: I6d0aae9a27f68c651f61024bedc4ca3e96c60fa0
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 { |