Stop using versioner.
I'll delete it later if this sticks.
Bug: None
Test: treehugger
Change-Id: I93699b5f954564fc6c22babf50423ae039bdf36d
diff --git a/libc/Android.bp b/libc/Android.bp
index 30e201a..e48d37e 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2231,10 +2231,11 @@
// NDK headers.
// ========================================================
-versioned_ndk_headers {
+ndk_headers {
name: "common_libc",
from: "include",
to: "",
+ srcs: ["include/**/*.h"],
license: "NOTICE",
}
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