commit 19de5005133108ddb91b8c60dc6f76f4878975b0
author Priyanka Advani (xWF) <padvani@google.com> Fri Nov 08 20:00:48 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 08 20:00:48 2024 +0000
tree b28b21253f013a3a0a80a24b3ec3bcc1cc46fa54
parent e840dc6fb0857b07bdb55d541986442fb46021d1
parent c79436a33e8038a46350ca667f6eab201d7bbc3e

Merge "Revert "No special treatment for vendor"" into main am: 2876a2cc88 am: c79436a33e

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3341362

Change-Id: Id0a8d3d05b4df42c3821305335c3acda6fd47429
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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__)