summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authorhuanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-02 05:51:12 +0000
committerhuanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-02 05:51:12 +0000
commit336005489a1ce2f7d6365f13fca5020e129a5dbd (patch)
treecd95734b659b1c7ff09002e34f5e2a20fb83b22e /chrome/chrome.gyp
parent5fff93f1d7914a9df12cac214beac3b885443937 (diff)
downloadchromium_src-336005489a1ce2f7d6365f13fca5020e129a5dbd.zip
chromium_src-336005489a1ce2f7d6365f13fca5020e129a5dbd.tar.gz
chromium_src-336005489a1ce2f7d6365f13fca5020e129a5dbd.tar.bz2
Revert r22080 and re-enable tcmalloc.
Review URL: http://codereview.chromium.org/159771 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22251 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 4c6cd567..236c80f 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -4555,6 +4555,7 @@
'../third_party/modp_b64/modp_b64.gyp:*',
'../third_party/npapi/npapi.gyp:*',
'../third_party/sqlite/sqlite.gyp:*',
+ '../third_party/tcmalloc/tcmalloc.gyp:*',
'../third_party/zlib/zlib.gyp:*',
'../webkit/tools/test_shell/test_shell.gyp:*',
'../webkit/webkit.gyp:*',
@@ -4593,6 +4594,7 @@
'../net/net.gyp:net_resources',
'../build/util/support/support.gyp:*',
'../third_party/cld/cld.gyp:cld',
+ '../third_party/tcmalloc/tcmalloc.gyp:tcmalloc',
'../views/views.gyp:views',
'../webkit/webkit.gyp:webkit_resources',
'../gears/gears.gyp:gears',