Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(573)

Unified Diff: build/common.gypi

Issue 16844006: Add new define MEMORY_TOOL_REPLACES_ALLOCATOR for when building for ASAN, valgrind, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update for review. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index e34b1590dd6a731b9bc385b864ad52d58a6e1e75..9e29839b5ec5fdb2c3895207e4494fbc64b8a5f0 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2057,7 +2057,10 @@
'Profile': 'true',
},
},
- 'defines': ['ADDRESS_SANITIZER'],
+ 'defines': [
+ 'ADDRESS_SANITIZER'
+ 'MEMORY_TOOL_REPLACES_ALLOCATOR',
+ ],
}], # asan==1 and OS=="win"
['coverage!=0', {
'conditions': [
@@ -2579,6 +2582,7 @@
],
}, {
'defines': [
+ 'MEMORY_TOOL_REPLACES_ALLOCATOR',
'DYNAMIC_ANNOTATIONS_ENABLED=1',
'WTF_USE_DYNAMIC_ANNOTATIONS=1',
],
@@ -3140,6 +3144,9 @@
# http://crbug.com/234010. As workaround, disable --as-needed.
'-Wl,--as-needed',
],
+ 'defines': [
+ 'MEMORY_TOOL_REPLACES_ALLOCATOR',
+ ],
}],
['_toolset=="target" and OS=="linux"', {
'ldflags': [
@@ -3254,7 +3261,10 @@
}],
['linux_use_heapchecker==1', {
'variables': {'linux_use_tcmalloc%': 1},
- 'defines': ['USE_HEAPCHECKER'],
+ 'defines': [
+ 'USE_HEAPCHECKER'
+ 'MEMORY_TOOL_REPLACES_ALLOCATOR',
+ ],
'conditions': [
['component=="shared_library"', {
# See crbug.com/112389
@@ -3801,6 +3811,7 @@
},
'defines': [
'ADDRESS_SANITIZER',
+ 'MEMORY_TOOL_REPLACES_ALLOCATOR',
],
}],
],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698