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

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

Issue 177353002: Add use_allocator instead of linux_use_tcmalloc to switch the allocator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 9 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
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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 'window_targeter_unittest.cc', 273 'window_targeter_unittest.cc',
274 'window_unittest.cc', 274 'window_unittest.cc',
275 ], 275 ],
276 'conditions': [ 276 'conditions': [
277 # osmesa GL implementation is used on linux. 277 # osmesa GL implementation is used on linux.
278 ['OS=="linux"', { 278 ['OS=="linux"', {
279 'dependencies': [ 279 'dependencies': [
280 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 280 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
281 ], 281 ],
282 }], 282 }],
283 ['OS=="linux" and linux_use_tcmalloc==1', { 283 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
284 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
284 'dependencies': [ 285 'dependencies': [
285 # See http://crbug.com/162998#c4 for why this is needed. 286 # See http://crbug.com/162998#c4 for why this is needed.
286 '../../base/allocator/allocator.gyp:allocator', 287 '../../base/allocator/allocator.gyp:allocator',
287 ], 288 ],
288 }], 289 }],
289 ], 290 ],
290 }, 291 },
291 ], 292 ],
292 } 293 }
OLDNEW
« no previous file with comments | « ui/app_list/app_list.gyp ('k') | ui/compositor/compositor.gyp » ('j') | ui/keyboard/keyboard.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698