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

Side by Side Diff: ash/ash.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: ready with use_allocator 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 | « no previous file | base/base.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 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after
1019 '../chromeos/chromeos.gyp:power_manager_proto', 1019 '../chromeos/chromeos.gyp:power_manager_proto',
1020 ], 1020 ],
1021 'sources': [ 1021 'sources': [
1022 'first_run/first_run_helper_unittest.cc', 1022 'first_run/first_run_helper_unittest.cc',
1023 ], 1023 ],
1024 }, { # else: chromeos!=1 1024 }, { # else: chromeos!=1
1025 'sources/': [ 1025 'sources/': [
1026 ['exclude', 'display/resolution_notification_controller_unittest.cc' ], 1026 ['exclude', 'display/resolution_notification_controller_unittest.cc' ],
1027 ], 1027 ],
1028 }], 1028 }],
1029 ['OS=="linux" and component=="shared_library" and linux_use_tcmalloc==1' , { 1029 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
darin (slow to review) 2014/03/01 00:38:56 maybe this GYP block would be better as a .gypi th
Dai Mikurube (NOT FULLTIME) 2014/03/01 01:01:19 Sure. Maybe. But actually, it's not trivial since
1030 ['OS=="linux" and component=="shared_library" and ((use_allocator!="none " and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" a nd linux_use_tcmalloc==1))', {
1030 'dependencies': [ 1031 'dependencies': [
1031 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 1032 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
1032 ], 1033 ],
1033 'link_settings': { 1034 'link_settings': {
1034 'ldflags': ['-rdynamic'], 1035 'ldflags': ['-rdynamic'],
1035 }, 1036 },
1036 }], 1037 }],
1037 ], 1038 ],
1038 }, 1039 },
1039 { 1040 {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
1113 }, 1114 },
1114 }, 1115 },
1115 'dependencies': [ 1116 'dependencies': [
1116 '../sandbox/sandbox.gyp:sandbox', 1117 '../sandbox/sandbox.gyp:sandbox',
1117 ], 1118 ],
1118 }], 1119 }],
1119 ], 1120 ],
1120 }, 1121 },
1121 ], 1122 ],
1122 } 1123 }
OLDNEW
« no previous file with comments | « no previous file | base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698