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

Side by Side Diff: base/base.gyp

Issue 177353002: Add use_allocator instead of linux_use_tcmalloc to switch the allocator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 9 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') | base/security_unittest.cc » ('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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 ['OS == "linux"', { 173 ['OS == "linux"', {
174 'link_settings': { 174 'link_settings': {
175 'libraries': [ 175 'libraries': [
176 # We need rt for clock_gettime(). 176 # We need rt for clock_gettime().
177 '-lrt', 177 '-lrt',
178 # For 'native_library_linux.cc' 178 # For 'native_library_linux.cc'
179 '-ldl', 179 '-ldl',
180 ], 180 ],
181 }, 181 },
182 'conditions': [ 182 'conditions': [
183 ['linux_use_tcmalloc==0', { 183 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
184 ['use_allocator!="tcmalloc" and (use_allocator!="see_use_tcmalloc" o r linux_use_tcmalloc==0)', {
184 'defines': [ 185 'defines': [
185 'NO_TCMALLOC', 186 'NO_TCMALLOC',
186 ], 187 ],
187 'direct_dependent_settings': { 188 'direct_dependent_settings': {
188 'defines': [ 189 'defines': [
189 'NO_TCMALLOC', 190 'NO_TCMALLOC',
190 ], 191 ],
191 }, 192 },
192 }], 193 }],
193 ], 194 ],
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 }, { # use_glib == 0 749 }, { # use_glib == 0
749 'sources!': [ 750 'sources!': [
750 'message_loop/message_pump_glib_unittest.cc', 751 'message_loop/message_pump_glib_unittest.cc',
751 ] 752 ]
752 }], 753 }],
753 ['use_ozone == 1', { 754 ['use_ozone == 1', {
754 'sources!': [ 755 'sources!': [
755 'message_loop/message_pump_glib_unittest.cc', 756 'message_loop/message_pump_glib_unittest.cc',
756 ] 757 ]
757 }], 758 }],
758 ['OS == "linux" and linux_use_tcmalloc==1', { 759 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
760 ['OS == "linux" and ((use_allocator!="none" and use_allocator!="see_use_ tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
759 'dependencies': [ 761 'dependencies': [
760 'allocator/allocator.gyp:allocator', 762 'allocator/allocator.gyp:allocator',
761 ], 763 ],
762 }, 764 },
763 ], 765 ],
764 ['OS == "win"', { 766 ['OS == "win"', {
765 'sources!': [ 767 'sources!': [
766 'file_descriptor_shuffle_unittest.cc', 768 'file_descriptor_shuffle_unittest.cc',
767 'files/dir_reader_posix_unittest.cc', 769 'files/dir_reader_posix_unittest.cc',
768 'threading/worker_pool_posix_unittest.cc', 770 'threading/worker_pool_posix_unittest.cc',
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
1447 'base_unittests.isolate', 1449 'base_unittests.isolate',
1448 ], 1450 ],
1449 'sources': [ 1451 'sources': [
1450 'base_unittests.isolate', 1452 'base_unittests.isolate',
1451 ], 1453 ],
1452 }, 1454 },
1453 ], 1455 ],
1454 }], 1456 }],
1455 ], 1457 ],
1456 } 1458 }
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | base/security_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698