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

Side by Side Diff: ui/aura/aura.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/app_list/app_list.gyp ('k') | ui/compositor/compositor.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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 'window_targeter_unittest.cc', 278 'window_targeter_unittest.cc',
279 'window_unittest.cc', 279 'window_unittest.cc',
280 ], 280 ],
281 'conditions': [ 281 'conditions': [
282 # osmesa GL implementation is used on linux. 282 # osmesa GL implementation is used on linux.
283 ['OS=="linux"', { 283 ['OS=="linux"', {
284 'dependencies': [ 284 'dependencies': [
285 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 285 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
286 ], 286 ],
287 }], 287 }],
288 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 288 ['OS=="linux" and use_allocator!="none"', {
289 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
290 'dependencies': [ 289 'dependencies': [
291 # See http://crbug.com/162998#c4 for why this is needed. 290 # See http://crbug.com/162998#c4 for why this is needed.
292 '../../base/allocator/allocator.gyp:allocator', 291 '../../base/allocator/allocator.gyp:allocator',
293 ], 292 ],
294 }], 293 }],
295 ], 294 ],
296 }, 295 },
297 ], 296 ],
298 } 297 }
OLDNEW
« no previous file with comments | « ui/app_list/app_list.gyp ('k') | ui/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698