diff options
| author | dmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 09:09:06 +0000 |
|---|---|---|
| committer | dmikurube@chromium.org <dmikurube@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 09:09:06 +0000 |
| commit | de4b01cc9e693c78911ee6401ae58948ca861fd2 (patch) | |
| tree | c42df06c577307071d17ac8b0ac19fc7d17c3d0f /content/content_shell.gypi | |
| parent | be992d70d94df8a0c04347136b7bfd936e576b03 (diff) | |
| download | chromium_src-de4b01cc9e693c78911ee6401ae58948ca861fd2.zip chromium_src-de4b01cc9e693c78911ee6401ae58948ca861fd2.tar.gz chromium_src-de4b01cc9e693c78911ee6401ae58948ca861fd2.tar.bz2 | |
Fix a use_allocator condition for android_use_tcmalloc in content/content_shell.gypi.
BUG=345554
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/216573003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260095 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
| -rw-r--r-- | content/content_shell.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 1a132fd..d19cdc5 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -312,7 +312,7 @@ ], }], # TODO(dmikurube): Kill {linux|android}_use_tcmalloc. http://crbug.com/345554 - ['(os_posix==1 and use_aura==1 and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and ((OS=="linux" and linux_use_tcmalloc==1) or (OS=="android" and android_use_tcmalloc==1)))))', { + ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and ((OS=="linux" and os_posix==1 and use_aura==1 and linux_use_tcmalloc==1) or (OS=="android" and android_use_tcmalloc==1)))', { 'dependencies': [ # This is needed by content/app/content_main_runner.cc '../base/allocator/allocator.gyp:allocator', |