commit 2876a2cc8809b2e7b54abe91dfc21a1a927708a1
author Priyanka Advani (xWF) <padvani@google.com> Fri Nov 08 19:05:16 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 08 19:05:16 2024 +0000
tree b28b21253f013a3a0a80a24b3ec3bcc1cc46fa54
parent 5df75e3d23731698ffa5b5af1d994e02b992a3d9
parent b2aa69fb7f72a91dc3fe9852a8a8f0001d2e4589

Merge "Revert "No special treatment for vendor"" into main

libc/include/android/versioning.h

diff --git a/libc/include/android/versioning.h b/libc/include/android/versioning.h
index 1cf6e51..1676a72 100644
--- a/libc/include/android/versioning.h
+++ b/libc/include/android/versioning.h
@@ -80,3 +80,10 @@
 #define __INTRODUCED_IN_32(api_level)
 #define __INTRODUCED_IN_64(api_level) __BIONIC_AVAILABILITY(introduced=api_level)
 #endif
+
+// Vendor and product modules do not follow SDK versioning. Ignore NDK guards for these modules.
+#if defined(__ANDROID_VNDK__)
+#undef __BIONIC_AVAILABILITY
+#define __BIONIC_AVAILABILITY(api_level, ...)
+#define __BIONIC_AVAILABILITY_GUARD(api_level) 1
+#endif // defined(__ANDROID_VNDK__)