From abd0824ba64094e860803730c44d985334ad8770 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 3 Apr 2018 14:52:04 -0700 Subject: - 985074b3d2f08388125a0004a4984f1d64fb0fcf In the internal implementation, avoid conflicting definit... by Abseil Team GitOrigin-RevId: 985074b3d2f08388125a0004a4984f1d64fb0fcf Change-Id: I1a564ac086a36bb52d36aeb5f500c7099d2ee032 --- absl/base/internal/malloc_hook.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/absl/base/internal/malloc_hook.cc b/absl/base/internal/malloc_hook.cc index e7b626df..c364d3ff 100644 --- 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 -- cgit v1.2.3