summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-17 19:58:10 +0000
committerbbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-17 19:58:10 +0000
commit491ce92c01391c8375fc9ad71ac07c6bb75f4fda (patch)
tree5d9c1403793216b10ad45bee1b7f5068c00dff65 /base
parent3b6bf4c9a64304768bd68d3d948734e34f808515 (diff)
downloadchromium_src-491ce92c01391c8375fc9ad71ac07c6bb75f4fda.zip
chromium_src-491ce92c01391c8375fc9ad71ac07c6bb75f4fda.tar.gz
chromium_src-491ce92c01391c8375fc9ad71ac07c6bb75f4fda.tar.bz2
Disable leak annotations for NaCl untrusted builds.
BUG=116317 TEST=compiles on linux heap checker bots Review URL: https://chromiumcodereview.appspot.com/10824356 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/debug/leak_annotations.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/debug/leak_annotations.h b/base/debug/leak_annotations.h
index 7da0920..51adfb0 100644
--- a/base/debug/leak_annotations.h
+++ b/base/debug/leak_annotations.h
@@ -7,7 +7,8 @@
#include "build/build_config.h"
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(USE_HEAPCHECKER)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_NACL) && \
+ defined(USE_HEAPCHECKER)
#include "third_party/tcmalloc/chromium/src/gperftools/heap-checker.h"