| Index: remoting/remoting_test.gypi
|
| diff --git a/remoting/remoting_test.gypi b/remoting/remoting_test.gypi
|
| index 0b90f4789a6298656ba40b6dd1f4ec1bfe43bcdc..6a3532455ddd11062c6f2c026b5a3392ee4d8f6a 100644
|
| --- a/remoting/remoting_test.gypi
|
| +++ b/remoting/remoting_test.gypi
|
| @@ -131,6 +131,7 @@
|
| 'host/branding.cc',
|
| 'host/branding.h',
|
| 'host/capture_scheduler_unittest.cc',
|
| + 'host/chromeos/aura_desktop_capturer_unittest.cc',
|
| 'host/chromoting_host_context_unittest.cc',
|
| 'host/chromoting_host_unittest.cc',
|
| 'host/client_session_unittest.cc',
|
| @@ -242,13 +243,19 @@
|
| [ 'chromeos==0', {
|
| 'sources!': [
|
| 'client/plugin/normalizing_input_filter_cros_unittest.cc',
|
| + 'host/chromeos/aura_desktop_capturer_unittest.cc',
|
| ],
|
| + }, { # chromeos==1
|
| + 'dependencies': [
|
| + '../ash/ash.gyp:ash',
|
| + '../cc/cc.gyp:cc',
|
| + '../ui/aura/aura.gyp:aura',
|
| + ]
|
| }],
|
| ['enable_remoting_host == 0', {
|
| 'dependencies!': [
|
| 'remoting_host',
|
| 'remoting_host_setup_base',
|
| - 'remoting_it2me_host_static',
|
| 'remoting_native_messaging_base',
|
| ],
|
| 'sources/': [
|
| @@ -257,6 +264,14 @@
|
| ['exclude', '^base/resources_unittest\\.cc$'],
|
| ]
|
| }],
|
| + ['enable_it2me_host == 0', {
|
| + 'dependencies!': [
|
| + 'remoting_it2me_host_static',
|
| + ],
|
| + 'sources/': [
|
| + ['exclude', '^host/it2me/'],
|
| + ]
|
| + }],
|
| [ 'OS == "linux" and use_allocator!="none"', {
|
| 'dependencies': [
|
| '../base/allocator/allocator.gyp:allocator',
|
|
|