- 985074b3d2f08388125a0004a4984f1d64fb0fcf In the internal implementation, avoid conflicting definit... by Abseil Team <absl-team@google.com>

GitOrigin-RevId: 985074b3d2f08388125a0004a4984f1d64fb0fcf Change-Id: I1a564ac086a36bb52d36aeb5f500c7099d2ee032
7 years ago · abd0824ba6
parent 0e5c3e8f16
commit abd0824ba6
1 changed files with 2 additions and 1 deletions
--- a/absl/base/internal/malloc_hook.cc
+++ b/absl/base/internal/malloc_hook.cc
@ -539,7 +539,8 @@ int MallocHook::GetCallerStackTrace(void** result, int max_depth,
 // msan config; Replace MALLOC_HOOK_MMAP_DISABLE with
 // ABSL_MALLOC_HOOK_MMAP_DISABLE for other special cases.
 #if !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && \
-    !defined(ABSL_MALLOC_HOOK_MMAP_DISABLE) && defined(__linux__)
+    !defined(ABSL_MALLOC_HOOK_MMAP_DISABLE) && !defined(__ANDROID__) && \
+    defined(__linux__)
 #include "absl/base/internal/malloc_hook_mmap_linux.inc"

 #elif ABSL_HAVE_MMAP