Reapply "Stop using versioner."
With the new module excluded from C compat checks for similar reasons
as the other bionic modules.
This reverts commit 106afcd87f5fb724c942f27646b42d80f1735166.
Bug: None
Test: None
Change-Id: I9cdf2ca206b1bc0a516fdfc9d23cc35cc39d87c1
diff --git a/libc/Android.bp b/libc/Android.bp
index 30e201a..107db88 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2231,11 +2231,17 @@
// NDK headers.
// ========================================================
-versioned_ndk_headers {
+ndk_headers {
name: "common_libc",
from: "include",
to: "",
+ srcs: ["include/**/*.h"],
license: "NOTICE",
+ // These don't pass the bad verification we do because many of them are
+ // arch-specific, and they aren't necessarily independently includable.
+ // That's not much of a problem though, since C-incompaitibilities in the
+ // UAPI headers should run into problems long before they reach us.
+ skip_verification: true,
}
ndk_headers {
@@ -2255,10 +2261,6 @@
"kernel/uapi/xen/**/*.h",
],
license: "NOTICE",
- // These don't pass the bad verification we do because many of them are
- // arch-specific, and they aren't necessarily independently includable.
- // That's not much of a problem though, since C-incompaitibilities in the
- // UAPI headers should run into problems long before they reach us.
skip_verification: true,
}
diff --git a/libc/include/malloc.h b/libc/include/malloc.h
index 21c3b36..5904519 100644
--- a/libc/include/malloc.h
+++ b/libc/include/malloc.h
@@ -76,6 +76,9 @@
*/
void* _Nullable realloc(void* _Nullable __ptr, size_t __byte_count) __BIONIC_ALLOC_SIZE(2) __wur;
+// Remove the explicit guard once //external/giflib has been fixed so that it no
+// longer provides a conflicting definition: http://b/352784252
+#if __ANDROID_API__ >= 29
/**
* [reallocarray(3)](https://man7.org/linux/man-pages/man3/realloc.3.html) resizes
* allocated memory on the heap.
@@ -88,6 +91,7 @@
* (but see the notes for malloc()).
*/
void* _Nullable reallocarray(void* _Nullable __ptr, size_t __item_count, size_t __item_size) __BIONIC_ALLOC_SIZE(2, 3) __wur __INTRODUCED_IN(29);
+#endif
/**
* [free(3)](https://man7.org/linux/man-pages/man3/free.3.html) deallocates