From 9024c66a1de0a5dba9a76c57e9e8020304c31995 Mon Sep 17 00:00:00 2001 From: "akalin@chromium.org" Date: Thu, 16 May 2013 06:24:18 +0000 Subject: Add deps on allocator.gyp:allocator for some remoting executables This is necessary to make them build with the component build and linux_use_heapchecker=1. BUG=240871 Review URL: https://chromiumcodereview.appspot.com/15005009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200465 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/remoting.gyp | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'remoting/remoting.gyp') diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index c04515d..1c4a1d0 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -589,6 +589,13 @@ 'sources': [ 'host/keygen_main.cc', ], + 'conditions': [ + ['OS=="linux" and linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], }, # end of target 'remoting_host_keygen' { @@ -731,6 +738,13 @@ 'host/setup/native_messaging_writer.cc', 'host/setup/native_messaging_writer.h', ], + 'conditions': [ + ['OS=="linux" and linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], }, # end of target 'remoting_native_messaging_host' ], # end of 'targets' }], # 'enable_remoting_host==1' @@ -870,6 +884,11 @@ }], # mac_breakpad==1 ], # conditions }], # OS=mac + ['OS=="linux" and linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], # OS=linux ], # end of 'conditions' }, # end of target 'remoting_me2me_host' @@ -924,6 +943,13 @@ 'sources': [ 'host/setup/start_host.cc', ], + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], }, # end of target 'remoting_start_host' ], # end of 'targets' }], # 'OS=="linux"' -- cgit v1.1