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

Side by Side Diff: net/net.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 | « media/media.gyp ('k') | ppapi/ppapi_tests.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 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'use_tracing_cache_backend%': 0, 10 'use_tracing_cache_backend%': 0,
(...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 ], 526 ],
527 }, { # desktop_linux == 0 and chromeos == 0 527 }, { # desktop_linux == 0 and chromeos == 0
528 'sources!': [ 528 'sources!': [
529 'cert/nss_cert_database_unittest.cc', 529 'cert/nss_cert_database_unittest.cc',
530 ], 530 ],
531 }], 531 }],
532 ], 532 ],
533 }], 533 }],
534 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 534 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
535 'conditions': [ 535 'conditions': [
536 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 536 ['use_allocator!="none"', {
537 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
538 'dependencies': [ 537 'dependencies': [
539 '../base/allocator/allocator.gyp:allocator', 538 '../base/allocator/allocator.gyp:allocator',
540 ], 539 ],
541 }], 540 }],
542 ], 541 ],
543 }], 542 }],
544 [ 'use_kerberos==1', { 543 [ 'use_kerberos==1', {
545 'defines': [ 544 'defines': [
546 'USE_KERBEROS', 545 'USE_KERBEROS',
547 ], 546 ],
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 ], 879 ],
881 }, { 880 }, {
882 'dependencies': [ 881 'dependencies': [
883 '../build/linux/system.gyp:ssl', 882 '../build/linux/system.gyp:ssl',
884 ], 883 ],
885 }], 884 }],
886 ], 885 ],
887 }], 886 }],
888 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 887 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
889 'conditions': [ 888 'conditions': [
890 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 889 ['use_allocator!="none"', {
891 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
892 'dependencies': [ 890 'dependencies': [
893 '../base/allocator/allocator.gyp:allocator', 891 '../base/allocator/allocator.gyp:allocator',
894 ], 892 ],
895 }], 893 }],
896 ], 894 ],
897 }], 895 }],
898 ['OS != "android"', { 896 ['OS != "android"', {
899 'sources!': [ 897 'sources!': [
900 'test/spawned_test_server/remote_test_server.cc', 898 'test/spawned_test_server/remote_test_server.cc',
901 'test/spawned_test_server/remote_test_server.h', 899 'test/spawned_test_server/remote_test_server.h',
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
1567 'net_unittests.isolate', 1565 'net_unittests.isolate',
1568 ], 1566 ],
1569 'sources': [ 1567 'sources': [
1570 'net_unittests.isolate', 1568 'net_unittests.isolate',
1571 ], 1569 ],
1572 }, 1570 },
1573 ], 1571 ],
1574 }], 1572 }],
1575 ], 1573 ],
1576 } 1574 }
OLDNEW
« no previous file with comments | « media/media.gyp ('k') | ppapi/ppapi_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698