Revert "Stop using versioner."
This reverts commit e135120350841c4f0230167c48a7a2757a4f12eb.
Reason for revert: Potential culprit for b/361440272- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: I84d8e707abd1dc32048ae2aa10d7dacf0f9af6a3
diff --git a/libc/Android.bp b/libc/Android.bp
index e48d37e..30e201a 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2231,11 +2231,10 @@
// NDK headers.
// ========================================================
-ndk_headers {
+versioned_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 5904519..21c3b36 100644
--- a/libc/include/malloc.h
+++ b/libc/include/malloc.h
@@ -76,9 +76,6 @@
*/
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.
@@ -91,7 +88,6 @@
* (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