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

Side by Side Diff: base/base.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 | « ash/ash.gyp ('k') | build/common.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 (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 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 ['OS == "linux"', { 136 ['OS == "linux"', {
137 'link_settings': { 137 'link_settings': {
138 'libraries': [ 138 'libraries': [
139 # We need rt for clock_gettime(). 139 # We need rt for clock_gettime().
140 '-lrt', 140 '-lrt',
141 # For 'native_library_linux.cc' 141 # For 'native_library_linux.cc'
142 '-ldl', 142 '-ldl',
143 ], 143 ],
144 }, 144 },
145 'conditions': [ 145 'conditions': [
146 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 146 ['use_allocator!="tcmalloc"', {
147 ['use_allocator!="tcmalloc" and (use_allocator!="see_use_tcmalloc" o r linux_use_tcmalloc==0)', {
148 'defines': [ 147 'defines': [
149 'NO_TCMALLOC', 148 'NO_TCMALLOC',
150 ], 149 ],
151 'direct_dependent_settings': { 150 'direct_dependent_settings': {
152 'defines': [ 151 'defines': [
153 'NO_TCMALLOC', 152 'NO_TCMALLOC',
154 ], 153 ],
155 }, 154 },
156 }], 155 }],
157 ], 156 ],
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 }, { # use_glib == 0 692 }, { # use_glib == 0
694 'sources!': [ 693 'sources!': [
695 'message_loop/message_pump_glib_unittest.cc', 694 'message_loop/message_pump_glib_unittest.cc',
696 ] 695 ]
697 }], 696 }],
698 ['use_ozone == 1', { 697 ['use_ozone == 1', {
699 'sources!': [ 698 'sources!': [
700 'message_loop/message_pump_glib_unittest.cc', 699 'message_loop/message_pump_glib_unittest.cc',
701 ] 700 ]
702 }], 701 }],
703 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554 702 ['OS == "linux" and use_allocator!="none"', {
704 ['OS == "linux" and ((use_allocator!="none" and use_allocator!="see_use_ tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
705 'dependencies': [ 703 'dependencies': [
706 'allocator/allocator.gyp:allocator', 704 'allocator/allocator.gyp:allocator',
707 ], 705 ],
708 }, 706 },
709 ], 707 ],
710 ['OS == "win"', { 708 ['OS == "win"', {
711 'sources!': [ 709 'sources!': [
712 'file_descriptor_shuffle_unittest.cc', 710 'file_descriptor_shuffle_unittest.cc',
713 'files/dir_reader_posix_unittest.cc', 711 'files/dir_reader_posix_unittest.cc',
714 'threading/worker_pool_posix_unittest.cc', 712 'threading/worker_pool_posix_unittest.cc',
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
1451 'base_unittests.isolate', 1449 'base_unittests.isolate',
1452 ], 1450 ],
1453 'sources': [ 1451 'sources': [
1454 'base_unittests.isolate', 1452 'base_unittests.isolate',
1455 ], 1453 ],
1456 }, 1454 },
1457 ], 1455 ],
1458 }], 1456 }],
1459 ], 1457 ],
1460 } 1458 }
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | build/common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698