diff options
| author | 2024-06-18 01:12:30 +0000 | |
|---|---|---|
| committer | 2024-06-18 01:12:30 +0000 | |
| commit | 9b1356c1390ca036fb3058afa024e6f69ea76a5c (patch) | |
| tree | b3c975257e9d8fef00825d5c44bd4d74984d9371 | |
| parent | 579f0c2a2ee68484fa59cf51ea974b5cd0d0a931 (diff) | |
| parent | 2a2f7145decd6f57f214bd4a5d56595830de4875 (diff) | |
Merge "libbinder_ndk: V APIs are guarded with V" into main
| -rw-r--r-- | libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h b/libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h index 61fb9379fa..b2ffb2bf3c 100644 --- a/libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h +++ b/libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h @@ -26,13 +26,10 @@ #if defined(__ANDROID_VENDOR__) #include <android/llndk-versioning.h> #else // __ANDROID_VENDOR__ -#if defined(API_LEVEL_AT_LEAST) -// Redefine API_LEVEL_AT_LEAST here to replace the version to __ANDROID_API_FUTURE__ as a workaround -#undef API_LEVEL_AT_LEAST -#endif -// TODO(b/322384429) switch this __ANDROID_API_FUTURE__ to sdk_api_level when V is finalized +#if !defined(API_LEVEL_AT_LEAST) #define API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) \ - (__builtin_available(android __ANDROID_API_FUTURE__, *)) + (__builtin_available(android sdk_api_level, *)) +#endif #endif // __ANDROID_VENDOR__ namespace aidl::android::os { |