diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /base/allocator/allocator.gyp | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'base/allocator/allocator.gyp')
| -rw-r--r-- | base/allocator/allocator.gyp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index a1ad04d..64b1159 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -354,6 +354,17 @@ '<(tcmalloc_dir)/src/debugallocation.cc', ], }], + [ 'linux_keep_shadow_stacks==1', { + 'sources': [ + '<(tcmalloc_dir)/src/linux_shadow_stacks.cc', + '<(tcmalloc_dir)/src/linux_shadow_stacks.h', + '<(tcmalloc_dir)/src/stacktrace_shadow-inl.h', + ], + 'cflags': [ + '-finstrument-functions', + '-DKEEP_SHADOW_STACKS', + ], + }], [ 'linux_use_heapchecker==0', { # Do not compile and link the heapchecker source. 'sources!': [ |