Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

Side by Side Diff: ui/compositor/compositor.gyp

Issue 258433005: Remove {linux|android}_use_tcmalloc and switch to use_allocator in Chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/events/events.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 ], 155 ],
156 'conditions': [ 156 'conditions': [
157 # osmesa GL implementation is used on linux. 157 # osmesa GL implementation is used on linux.
158 ['OS=="linux"', { 158 ['OS=="linux"', {
159 'dependencies': [ 159 'dependencies': [
160 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 160 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
161 ], 161 ],
162 }], 162 }],
163 ['os_posix == 1 and OS != "mac"', { 163 ['os_posix == 1 and OS != "mac"', {
164 'conditions': [ 164 'conditions': [
165 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 165 ['use_allocator!="none"', {
166 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
167 'dependencies': [ 166 'dependencies': [
168 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 167 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
169 ], 168 ],
170 }], 169 }],
171 ], 170 ],
172 }], 171 }],
173 ], 172 ],
174 }, 173 },
175 ], 174 ],
176 } 175 }
OLDNEW
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/events/events.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698