Skip to content

Commit 1aed4a8

Browse files
Treehugger RobotGerrit Code Review
authored andcommitted
Merge "Fix host libbinder_ndk build for API_LEVEL_AT_LEAST" into main
2 parents 9865dc2 + 99510a2 commit 1aed4a8

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@
2525
// Include llndk-versioning.h only for vendor build as it is not available for NDK headers.
2626
#if defined(__ANDROID_VENDOR__)
2727
#include <android/llndk-versioning.h>
28-
#else // __ANDROID_VENDOR__
29-
#if !defined(API_LEVEL_AT_LEAST)
28+
#elif !defined(API_LEVEL_AT_LEAST)
29+
#if defined(__BIONIC__)
3030
#define API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) \
3131
(__builtin_available(android sdk_api_level, *))
32-
#endif
32+
#else
33+
#define API_LEVEL_AT_LEAST(sdk_api_level, vendor_api_level) (true)
34+
#endif // __BIONIC__
3335
#endif // __ANDROID_VENDOR__
3436

3537
namespace aidl::android::os {

0 commit comments

Comments
 (0)