From 4f61be28eaf5297057b2c4f9b65b47018655bbb1 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Mon, 17 Jun 2024 13:29:11 +0900 Subject: 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 --- libs/ui/Gralloc5.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libs/ui/Gralloc5.cpp') 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 { -- cgit v1.2.3-59-g8ed1b