summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2024-06-17 13:29:11 +0900
committer Jooyung Han <jooyung@google.com> 2024-06-17 17:11:11 +0900
commit4f61be28eaf5297057b2c4f9b65b47018655bbb1 (patch)
tree2614038a4f04811a088400f83dded1305fc02d2d
parent5b7e5350a681c8331c3d5d71f2e4de3cb72fbc86 (diff)
libui: use __ANDROID_API_V__
__builtin_available() now works with preview SDK version (V in this case). No need to use __ANDROID_API_FUTURE__ which was a workaround. __builtin_available(andorid 35, *) evaluates to true if - the platform SDK version is 35 or higher - or, the platform is a preview (not REL) Bug: 322384429 Test: CF loads mapper from vapex Change-Id: I264cf444a0fb163e445471920930b6be3930dd03
-rw-r--r--libs/ui/Gralloc5.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/ui/Gralloc5.cpp b/libs/ui/Gralloc5.cpp
index 303043a35a..c4157abe5d 100644
--- a/libs/ui/Gralloc5.cpp
+++ b/libs/ui/Gralloc5.cpp
@@ -90,8 +90,7 @@ static void *loadIMapperLibrary() {
}
void* so = nullptr;
- // TODO(b/322384429) switch this to __ANDROID_API_V__ when V is finalized
- if API_LEVEL_AT_LEAST(__ANDROID_API_FUTURE__, 202404) {
+ if API_LEVEL_AT_LEAST (__ANDROID_API_V__, 202404) {
so = AServiceManager_openDeclaredPassthroughHal("mapper", mapperSuffix.c_str(),
RTLD_LOCAL | RTLD_NOW);
} else {