diff options
| author | 2024-03-20 00:31:29 +0000 | |
|---|---|---|
| committer | 2024-03-20 00:31:29 +0000 | |
| commit | 585f48c30b5409f2cc05482e6813901ca6c1b4dd (patch) | |
| tree | 7c95fd1c2bdc10c26d40c00b33fe4b1238b41bec /libs/ui/Gralloc5.cpp | |
| parent | 26f5abe5e8052f5b7fe9628fa07bd1b21abb6a45 (diff) | |
| parent | bc28d7b5b4fd58b5969e01befb3f472a8f0ff2f5 (diff) | |
Merge "Include llndk-versioning.h for LLNDK versioning." into main am: bc28d7b5b4
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2995998
Change-Id: I724dad189f6c1706e69dd2d5da509ff52b365858
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ui/Gralloc5.cpp b/libs/ui/Gralloc5.cpp index 25850f71cb..303043a35a 100644 --- a/libs/ui/Gralloc5.cpp +++ b/libs/ui/Gralloc5.cpp @@ -22,6 +22,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,8 +91,7 @@ static void *loadIMapperLibrary() { void* so = nullptr; // TODO(b/322384429) switch this to __ANDROID_API_V__ when V is finalized - // TODO(b/302113279) use __ANDROID_VENDOR_API__ for vendor variant - if (__builtin_available(android __ANDROID_API_FUTURE__, *)) { + if API_LEVEL_AT_LEAST(__ANDROID_API_FUTURE__, 202404) { so = AServiceManager_openDeclaredPassthroughHal("mapper", mapperSuffix.c_str(), RTLD_LOCAL | RTLD_NOW); } else { |