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

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

Powered by Google App Engine
This is Rietveld 408576698