summaryrefslogtreecommitdiffstats
path: root/base/allocator/allocator.gyp
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 23:27:05 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-07 23:27:05 +0000
commit6452f1c0627a15a097472da9ea848408ebe080a8 (patch)
tree19852185abec0c3d5da551944756efc6e41d2d00 /base/allocator/allocator.gyp
parent84f3d2da5271db6b299afc310c2a479b5d244822 (diff)
downloadchromium_src-6452f1c0627a15a097472da9ea848408ebe080a8.zip
chromium_src-6452f1c0627a15a097472da9ea848408ebe080a8.tar.gz
chromium_src-6452f1c0627a15a097472da9ea848408ebe080a8.tar.bz2
Support mixed allocation in browser vs subprocesses
Continue to support selection of a browser allocator selection via the environment variable CHROME_ALLOCATOR, and also add CHROME_ALLOCATOR_2 that can select the allocator to use in subprocesses, such as a renderer. Temporarilly set the browser default to the default windows heap allocator, and the subprocess allocator to TCMalloc to help detect memory corruption in a cannary for a few days. Add minor cleanup (removing reserved word "override" etc.). r=mbelshe bug=74901 Review URL: http://codereview.chromium.org/6623059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77207 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/allocator/allocator.gyp')
-rw-r--r--base/allocator/allocator.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index 9eb96de..065cbf4 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -176,6 +176,7 @@
'<(jemalloc_dir)/rb.h',
'allocator_shim.cc',
+ 'allocator_shim.h',
'generic_allocators.cc',
'win_allocator.cc',
],