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

Side by Side Diff: ui/keyboard/keyboard.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/events/events.gyp ('k') | ui/message_center/message_center.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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 '../gfx/gfx.gyp:gfx_geometry', 92 '../gfx/gfx.gyp:gfx_geometry',
93 '../resources/ui_resources.gyp:ui_test_pak', 93 '../resources/ui_resources.gyp:ui_test_pak',
94 '../wm/wm.gyp:wm', 94 '../wm/wm.gyp:wm',
95 'keyboard', 95 'keyboard',
96 ], 96 ],
97 'sources': [ 97 'sources': [
98 'test/run_all_unittests.cc', 98 'test/run_all_unittests.cc',
99 'keyboard_controller_unittest.cc', 99 'keyboard_controller_unittest.cc',
100 ], 100 ],
101 'conditions': [ 101 'conditions': [
102 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 102 ['OS=="linux" and use_allocator!="none"', {
103 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
104 'dependencies': [ 103 'dependencies': [
105 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 104 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
106 ], 105 ],
107 'link_settings': { 106 'link_settings': {
108 'ldflags': ['-rdynamic'], 107 'ldflags': ['-rdynamic'],
109 }, 108 },
110 }], 109 }],
111 ['OS=="win" and win_use_allocator_shim==1', { 110 ['OS=="win" and win_use_allocator_shim==1', {
112 'dependencies': [ 111 'dependencies': [
113 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 112 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
114 ], 113 ],
115 }], 114 }],
116 ], 115 ],
117 }, 116 },
118 ], 117 ],
119 } 118 }
OLDNEW
« no previous file with comments | « ui/events/events.gyp ('k') | ui/message_center/message_center.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698