diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 01:12:18 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 01:12:18 +0000 |
| commit | 3e0a8b86a3ea0f3da932df88738fa4d5ac4f8a04 (patch) | |
| tree | 9cafeba5b768975e01966c9028f225502e295043 /base/base.gypi | |
| parent | 19695a2dc9e77d00bf7205225467ebf8ffb16da4 (diff) | |
| download | chromium_src-3e0a8b86a3ea0f3da932df88738fa4d5ac4f8a04.zip chromium_src-3e0a8b86a3ea0f3da932df88738fa4d5ac4f8a04.tar.gz chromium_src-3e0a8b86a3ea0f3da932df88738fa4d5ac4f8a04.tar.bz2 | |
Linux: Undo a bit of tcmalloc gyp change from r49597. The reverted change puts direct_dependent_settings inside a configuration dictionary, which is invalid.
BUG=45067
TEST=GYP_DEFINES='linux_use_tcmalloc=0' gclient runhooks works.
Review URL: http://codereview.chromium.org/2819031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
| -rw-r--r-- | base/base.gypi | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/base/base.gypi b/base/base.gypi index 9894dd3..d32d694 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -465,17 +465,6 @@ 'sources/': [ ['include', '_chromeos\\.cc$'] ] }, ], - [ 'linux_use_tcmalloc==0', { - 'defines': [ - 'NO_TCMALLOC', - ], - 'direct_dependent_settings': { - 'defines': [ - 'NO_TCMALLOC', - ], - }, - }, - ], ], 'defines': [ 'USE_SYMBOLIZE', @@ -532,6 +521,17 @@ 'conditions': [ [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 'conditions': [ + [ 'linux_use_tcmalloc==0', { + 'defines': [ + 'NO_TCMALLOC', + ], + 'direct_dependent_settings': { + 'defines': [ + 'NO_TCMALLOC', + ], + }, + }, + ], [ 'linux_use_tcmalloc==1', { 'dependencies': [ 'allocator/allocator.gyp:allocator', |