Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 106afcd

Browse files
Pechetty Sravani (xWF)Gerrit Code Review
authored andcommitted
Revert "Stop using versioner."
This reverts commit e135120. 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
1 parent e135120 commit 106afcd

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

libc/Android.bp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2231,11 +2231,10 @@ cc_library_static {
22312231
// NDK headers.
22322232
// ========================================================
22332233

2234-
ndk_headers {
2234+
versioned_ndk_headers {
22352235
name: "common_libc",
22362236
from: "include",
22372237
to: "",
2238-
srcs: ["include/**/*.h"],
22392238
license: "NOTICE",
22402239
}
22412240

libc/include/malloc.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@ void* _Nullable calloc(size_t __item_count, size_t __item_size) __mallocfunc __B
7676
*/
7777
void* _Nullable realloc(void* _Nullable __ptr, size_t __byte_count) __BIONIC_ALLOC_SIZE(2) __wur;
7878

79-
// Remove the explicit guard once //external/giflib has been fixed so that it no
80-
// longer provides a conflicting definition: http://b/352784252
81-
#if __ANDROID_API__ >= 29
8279
/**
8380
* [reallocarray(3)](https://man7.org/linux/man-pages/man3/realloc.3.html) resizes
8481
* allocated memory on the heap.
@@ -91,7 +88,6 @@ void* _Nullable realloc(void* _Nullable __ptr, size_t __byte_count) __BIONIC_ALL
9188
* (but see the notes for malloc()).
9289
*/
9390
void* _Nullable reallocarray(void* _Nullable __ptr, size_t __item_count, size_t __item_size) __BIONIC_ALLOC_SIZE(2, 3) __wur __INTRODUCED_IN(29);
94-
#endif
9591

9692
/**
9793
* [free(3)](https://man7.org/linux/man-pages/man3/free.3.html) deallocates

0 commit comments

Comments
 (0)