From 3a7cb4c637afdb6084f2f9eecdaedd49e2c02cc2 Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Sun, 6 Oct 2024 13:43:59 +0900 Subject: [PATCH] Use __ANDROID_VENDOR_API__ for vendor API surface Build system defines __ANDROID_VENDOR_API__ for non-system modules. Use this flag to provide vendor API surface for vendor or product variant modules. Bug: 368559337 Test: atest AImageReaderWindowTest Change-Id: I7da3d4ca9f92255a426af8d66b4391f3c1426759 --- .../include_llndk/android/llndk-versioning.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libvendorsupport/include_llndk/android/llndk-versioning.h b/libvendorsupport/include_llndk/android/llndk-versioning.h index 0402c2880..81d165f47 100644 --- a/libvendorsupport/include_llndk/android/llndk-versioning.h +++ b/libvendorsupport/include_llndk/android/llndk-versioning.h @@ -25,15 +25,15 @@ __attribute__((annotate("introduced_in_llndk=" #vendor_api_level))) #endif -#if defined(__ANDROID_VNDK__) - +#if defined(__ANDROID_VENDOR_API__) +// __ANDROID_VENDOR_API__ is defined only for vendor or product variant modules. // Use this macro as an `if` statement to call an API that are available to both NDK and LLNDK. -// This returns true for the vendor modules if the vendor_api_level is less than or equal to the -// ro.board.api_level. +// This returns true for vendor or product modules if the vendor_api_level is less than or equal to +// the ro.board.api_level. #define API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) \ constexpr(__ANDROID_VENDOR_API__ >= vendor_api_level) -#else // __ANDROID_VNDK__ +#else // __ANDROID_VENDOR_API__ // For non-vendor modules, API_LEVEL_AT_LEAST is replaced with __builtin_available(sdk_api_level) to // guard the API for __INTRODUCED_IN. @@ -42,4 +42,4 @@ (__builtin_available(android sdk_api_level, *)) #endif -#endif // __ANDROID_VNDK__ +#endif // __ANDROID_VENDOR_API__