diff options
| author | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 14:54:22 +0000 |
|---|---|---|
| committer | mmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 14:54:22 +0000 |
| commit | ef8f5ba5bffca6bfea249fec46c7c7419922c6a9 (patch) | |
| tree | 4a1f2e8fb69f993e5cf879188165bd39483e7749 /base | |
| parent | 15daa3231c36d75c017fe991e4492ed62356f577 (diff) | |
| download | chromium_src-ef8f5ba5bffca6bfea249fec46c7c7419922c6a9.zip chromium_src-ef8f5ba5bffca6bfea249fec46c7c7419922c6a9.tar.gz chromium_src-ef8f5ba5bffca6bfea249fec46c7c7419922c6a9.tar.bz2 | |
Move allocator dependency to base for profiler.cc.
Fixes Linux shlib errors like:
lib.target/libbase.so: undefined symbol: ProfilerStart
Review URL: http://codereview.chromium.org/1576015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gyp | 8 | ||||
| -rw-r--r-- | base/base.gypi | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/base/base.gyp b/base/base.gyp index 72255de..05f8a0f 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -170,14 +170,6 @@ 'file_version_info_unittest.cc', 'worker_pool_linux_unittest.cc', ], - 'conditions': [ - [ 'linux_use_tcmalloc==1', { - 'dependencies': [ - 'allocator/allocator.gyp:allocator', - ], - }, - ], - ], 'dependencies': [ '../build/linux/system.gyp:gtk', '../build/linux/system.gyp:nss', diff --git a/base/base.gypi b/base/base.gypi index 967b3aae..153f827 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -383,6 +383,12 @@ }, }, ], + [ 'linux_use_tcmalloc==1', { + 'dependencies': [ + 'allocator/allocator.gyp:allocator', + ], + }, + ], [ 'OS == "linux"', { 'link_settings': { 'libraries': [ |