summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 12:29:35 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 12:29:35 +0000
commitbba0fea38d068a93ee4297d4d34eef2789f2d1c8 (patch)
tree0a692cf963a072aed7dbe26dbf08d4a137d7c2d5 /build
parent6c590044a6f629c1ee2eaf57ea0d3e417243390a (diff)
downloadchromium_src-bba0fea38d068a93ee4297d4d34eef2789f2d1c8.zip
chromium_src-bba0fea38d068a93ee4297d4d34eef2789f2d1c8.tar.gz
chromium_src-bba0fea38d068a93ee4297d4d34eef2789f2d1c8.tar.bz2
Add the missing commas before MEMORY_TOOL_REPLACES_ALLOCATOR.
This should fix the current failures on the heapcheck bots. BUG=246860 TBR=thakis Review URL: https://codereview.chromium.org/16951012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 658fb7e..094b7e2 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2078,7 +2078,7 @@
},
},
'defines': [
- 'ADDRESS_SANITIZER'
+ 'ADDRESS_SANITIZER',
'MEMORY_TOOL_REPLACES_ALLOCATOR',
],
}], # asan==1 and OS=="win"
@@ -3297,7 +3297,7 @@
['linux_use_heapchecker==1', {
'variables': {'linux_use_tcmalloc%': 1},
'defines': [
- 'USE_HEAPCHECKER'
+ 'USE_HEAPCHECKER',
'MEMORY_TOOL_REPLACES_ALLOCATOR',
],
'conditions': [