Index: third_party/tcmalloc/chromium/src/malloc_hook.cc |
diff --git a/third_party/tcmalloc/chromium/src/malloc_hook.cc b/third_party/tcmalloc/chromium/src/malloc_hook.cc |
index 2f8608e41b0dac2c22f3bf01189dfda6b37e5a25..144008927570fbe4d3a854a008512fe2e12ab08a 100644 |
--- a/third_party/tcmalloc/chromium/src/malloc_hook.cc |
+++ b/third_party/tcmalloc/chromium/src/malloc_hook.cc |
@@ -1,10 +1,10 @@ |
// Copyright (c) 2005, Google Inc. |
// All rights reserved. |
-// |
+// |
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
// met: |
-// |
+// |
// * Redistributions of source code must retain the above copyright |
// notice, this list of conditions and the following disclaimer. |
// * Redistributions in binary form must reproduce the above |
@@ -14,7 +14,7 @@ |
// * Neither the name of Google Inc. nor the names of its |
// contributors may be used to endorse or promote products derived from |
// this software without specific prior written permission. |
-// |
+// |
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
@@ -694,7 +694,7 @@ extern "C" int MallocHook_GetCallerStackTrace(void** result, int max_depth, |
// to provide support for calling the related hooks (in addition, |
// of course, to doing what these functions normally do). |
-#if defined(__linux) |
+#if defined(__linux) && !defined(__ANDROID__) |
# include "malloc_hook_mmap_linux.h" |
#elif defined(__FreeBSD__) |