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

Side by Side Diff: ui/app_list/app_list.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 | « sync/sync_tests.gypi ('k') | ui/aura/aura.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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 # Needed to link to Obj-C static libraries. 251 # Needed to link to Obj-C static libraries.
252 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 252 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
253 }], 253 }],
254 ], 254 ],
255 }, { # OS!="mac" 255 }, { # OS!="mac"
256 'sources/': [ 256 'sources/': [
257 ['exclude', 'cocoa/'], 257 ['exclude', 'cocoa/'],
258 ], 258 ],
259 }], 259 }],
260 # See http://crbug.com/162998#c4 for why this is needed. 260 # See http://crbug.com/162998#c4 for why this is needed.
261 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 261 ['OS=="linux" and use_allocator!="none"', {
262 ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tc malloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
263 'dependencies': [ 262 'dependencies': [
264 '../../base/allocator/allocator.gyp:allocator', 263 '../../base/allocator/allocator.gyp:allocator',
265 # The following two dependencies provide the missing 264 # The following two dependencies provide the missing
266 # symbol HeapProfilerStart in Linux component builds. 265 # symbol HeapProfilerStart in Linux component builds.
267 # They probably can be removed after http://crbug.com/263316 266 # They probably can be removed after http://crbug.com/263316
268 '../../webkit/child/webkit_child.gyp:webkit_child', 267 '../../webkit/child/webkit_child.gyp:webkit_child',
269 ], 268 ],
270 }], 269 }],
271 ['OS=="win" and win_use_allocator_shim==1', { 270 ['OS=="win" and win_use_allocator_shim==1', {
272 'dependencies': [ 271 'dependencies': [
273 '../../base/allocator/allocator.gyp:allocator', 272 '../../base/allocator/allocator.gyp:allocator',
274 ], 273 ],
275 }], 274 }],
276 ], 275 ],
277 # Disable c4267 warnings until we fix size_t to int truncations. 276 # Disable c4267 warnings until we fix size_t to int truncations.
278 'msvs_disabled_warnings': [ 4267, ], 277 'msvs_disabled_warnings': [ 4267, ],
279 }, 278 },
280 ], 279 ],
281 } 280 }
OLDNEW
« no previous file with comments | « sync/sync_tests.gypi ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698