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

Side by Side Diff: remoting/remoting_host_linux.gypi

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 | « remoting/remoting_host.gypi ('k') | remoting/remoting_test.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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'conditions': [ 6 'conditions': [
7 ['OS=="linux" and branding=="Chrome" and enable_remoting_host==1', { 7 ['OS=="linux" and branding=="Chrome" and enable_remoting_host==1', {
8 'variables': { 8 'variables': {
9 'build_deb_script': 'host/installer/linux/build-deb.sh', 9 'build_deb_script': 'host/installer/linux/build-deb.sh',
10 'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", " <(DEPTH)"])', 10 'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", " <(DEPTH)"])',
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 'type': 'executable', 120 'type': 'executable',
121 'dependencies': [ 121 'dependencies': [
122 'remoting_host_setup_base', 122 'remoting_host_setup_base',
123 ], 123 ],
124 'sources': [ 124 'sources': [
125 'host/setup/host_starter.cc', 125 'host/setup/host_starter.cc',
126 'host/setup/host_starter.h', 126 'host/setup/host_starter.h',
127 'host/setup/start_host.cc', 127 'host/setup/start_host.cc',
128 ], 128 ],
129 'conditions': [ 129 'conditions': [
130 ['linux_use_tcmalloc==1', { 130 # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
131 ['(use_allocator!="none" and use_allocator!="see_use_tcmalloc") or ( use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1)', {
131 'dependencies': [ 132 'dependencies': [
132 '../base/allocator/allocator.gyp:allocator', 133 '../base/allocator/allocator.gyp:allocator',
133 ], 134 ],
134 }], 135 }],
135 ], 136 ],
136 }, # end of target 'remoting_start_host' 137 }, # end of target 'remoting_start_host'
137 ], # end of 'targets' 138 ], # end of 'targets'
138 }], # 'OS=="linux"' 139 }], # 'OS=="linux"'
139 140
140 ], # end of 'conditions' 141 ], # end of 'conditions'
141 } 142 }
OLDNEW
« no previous file with comments | « remoting/remoting_host.gypi ('k') | remoting/remoting_test.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698