summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorsgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-26 14:50:13 +0000
committersgk@chromium.org <sgk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-26 14:50:13 +0000
commit96a1e3abc64ade9fb24990d25c0bb530f722b9a0 (patch)
tree80a43f8de2ddccea437521976c9d94b7a701dfb4 /build
parentc0fbaed2be9b4df04c8cc9fe3f5c1c41b3459ca0 (diff)
downloadchromium_src-96a1e3abc64ade9fb24990d25c0bb530f722b9a0.zip
chromium_src-96a1e3abc64ade9fb24990d25c0bb530f722b9a0.tar.gz
chromium_src-96a1e3abc64ade9fb24990d25c0bb530f722b9a0.tar.bz2
Convert the existing .gyp configuration to use the new base\allocator
library with upstream source code from the new vendor branch patterns in third_party\jemalloc and third_party\tcmalloc. BUG=27911 TEST=none Review URL: http://codereview.chromium.org/435040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp
index 9223569..85849ed 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -86,6 +86,7 @@
}],
['OS=="win"', {
'dependencies': [
+ '../base/allocator/allocator.gyp:*',
'../breakpad/breakpad.gyp:*',
'../chrome/app/locales/locales.gyp:*',
'../courgette/courgette.gyp:*',
@@ -95,7 +96,6 @@
'../third_party/bsdiff/bsdiff.gyp:*',
'../third_party/bspatch/bspatch.gyp:*',
'../third_party/cld/cld.gyp:*',
- '../third_party/tcmalloc/tcmalloc.gyp:*',
'../tools/memory_watcher/memory_watcher.gyp:*',
],
}, {