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

Side by Side Diff: components/nacl.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 | « components/components_tests.gyp ('k') | content/content_app.gypi » ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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 'includes': [ 9 'includes': [
10 'nacl/nacl_defines.gypi', 10 'nacl/nacl_defines.gypi',
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 295 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
296 ], 296 ],
297 'conditions': [ 297 'conditions': [
298 ['use_glib == 1', { 298 ['use_glib == 1', {
299 'dependencies': [ 299 'dependencies': [
300 '../build/linux/system.gyp:glib', 300 '../build/linux/system.gyp:glib',
301 ], 301 ],
302 }], 302 }],
303 ['os_posix == 1 and OS != "mac"', { 303 ['os_posix == 1 and OS != "mac"', {
304 'conditions': [ 304 'conditions': [
305 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com /345554 305 ['use_allocator!="none"', {
306 ['(use_allocator!="none" and use_allocator!="see_use_tcmallo c") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
307 'dependencies': [ 306 'dependencies': [
308 '../base/allocator/allocator.gyp:allocator', 307 '../base/allocator/allocator.gyp:allocator',
309 ], 308 ],
310 }], 309 }],
311 ], 310 ],
312 }], 311 }],
313 ['use_seccomp_bpf == 0', { 312 ['use_seccomp_bpf == 0', {
314 'sources!': [ 313 'sources!': [
315 '../content/common/sandbox_linux/sandbox_bpf_base_policy_lin ux.cc', 314 '../content/common/sandbox_linux/sandbox_bpf_base_policy_lin ux.cc',
316 '../content/common/sandbox_linux/sandbox_init_linux.cc', 315 '../content/common/sandbox_linux/sandbox_init_linux.cc',
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
464 ], 463 ],
465 'include_dirs': [ 464 'include_dirs': [
466 '..', 465 '..',
467 ], 466 ],
468 'dependencies': [ 467 'dependencies': [
469 '../content/content.gyp:content_common', 468 '../content/content.gyp:content_common',
470 ], 469 ],
471 }, 470 },
472 ] 471 ]
473 } 472 }
OLDNEW
« no previous file with comments | « components/components_tests.gyp ('k') | content/content_app.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698