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

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: 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 | « 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 1007 matching lines...) Expand 10 before | Expand all | Expand 10 after
1018 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1018 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1019 ], 1019 ],
1020 'sources': [ 1020 'sources': [
1021 'first_run/first_run_helper_unittest.cc', 1021 'first_run/first_run_helper_unittest.cc',
1022 ], 1022 ],
1023 }, { # else: chromeos!=1 1023 }, { # else: chromeos!=1
1024 'sources/': [ 1024 'sources/': [
1025 ['exclude', 'display/resolution_notification_controller_unittest.cc' ], 1025 ['exclude', 'display/resolution_notification_controller_unittest.cc' ],
1026 ], 1026 ],
1027 }], 1027 }],
1028 ['OS=="linux" and component=="shared_library" and linux_use_tcmalloc==1' , { 1028 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
1029 ['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))', {
1029 'dependencies': [ 1030 'dependencies': [
1030 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 1031 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
1031 ], 1032 ],
1032 'link_settings': { 1033 'link_settings': {
1033 'ldflags': ['-rdynamic'], 1034 'ldflags': ['-rdynamic'],
1034 }, 1035 },
1035 }], 1036 }],
1036 ], 1037 ],
1037 }, 1038 },
1038 { 1039 {
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
1117 }], 1118 }],
1118 ['chromeos==1', { 1119 ['chromeos==1', {
1119 'dependencies': [ 1120 'dependencies': [
1120 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1121 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1121 ], 1122 ],
1122 }], 1123 }],
1123 ], 1124 ],
1124 }, 1125 },
1125 ], 1126 ],
1126 } 1127 }
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