0010.patch (1034B)
1 From: Michael Froman <mfroman@mozilla.com> 2 Date: Tue, 7 Jan 2025 15:37:00 -0600 3 Subject: Bug 1935474 - only apply android api < 17 fix for SYS_mmap2 if 4 actually on < 17 api. r?ng! 5 6 Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/7822a8be4fb906ec1570667f72565a1a91f17228 7 --- 8 abseil-cpp/absl/base/internal/direct_mmap.h | 2 +- 9 1 file changed, 1 insertion(+), 1 deletion(-) 10 11 diff --git a/abseil-cpp/absl/base/internal/direct_mmap.h b/abseil-cpp/absl/base/internal/direct_mmap.h 12 index 1beb2ee4e52..986a8200ad8 100644 13 --- a/abseil-cpp/absl/base/internal/direct_mmap.h 14 +++ b/abseil-cpp/absl/base/internal/direct_mmap.h 15 @@ -94,7 +94,7 @@ inline void* DirectMmap(void* start, size_t length, int prot, int flags, int fd, 16 errno = EINVAL; 17 return MAP_FAILED; 18 } 19 -#ifdef __BIONIC__ 20 +#if defined(__BIONIC__) && (!defined(__ANDROID_API__) || __ANDROID_API__ < 17) 21 // SYS_mmap2 has problems on Android API level <= 16. 22 // Workaround by invoking __mmap2() instead. 23 return __mmap2(start, length, prot, flags, fd,