diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-17 00:50:28 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-17 00:50:28 +0000 |
| commit | 9febc508fe46d3dfdc27d634b6088cb1d99cf7ef (patch) | |
| tree | 424f1325aef22a1701a7db726e5401c00d87d59a /remoting/remoting.gyp | |
| parent | 53b35b1ad9587c497a693ef57940b392bf9390dc (diff) | |
| download | chromium_src-9febc508fe46d3dfdc27d634b6088cb1d99cf7ef.zip chromium_src-9febc508fe46d3dfdc27d634b6088cb1d99cf7ef.tar.gz chromium_src-9febc508fe46d3dfdc27d634b6088cb1d99cf7ef.tar.bz2 | |
Chromoting: reverting most of r126520 which broke the Secure Attention Sequence emulation on Windows. The host should detect whether the emulation is available in runtime. Doing it during compilation requires a major surgery on remoting/remoting.gyp.
Review URL: http://codereview.chromium.org/9699081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 5f959ec..184ba6d 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -341,6 +341,11 @@ }], ], # conditions }], # OS=="mac" + [ 'OS=="win"', { + 'dependencies': [ + '../ipc/ipc.gyp:ipc' + ], + }], ['OS!="win"', { 'sources!': [ 'host/plugin/host_plugin.def', @@ -583,6 +588,8 @@ 'host/screen_recorder.h', 'host/server_log_entry.cc', 'host/server_log_entry.h', + 'host/session_event_executor_win.cc', + 'host/session_event_executor_win.h', 'host/signaling_connector.cc', 'host/signaling_connector.h', 'host/ui_strings.cc', @@ -701,6 +708,13 @@ 'host/it2me_host_user_interface.h', 'host/simple_host_process.cc', ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + '../ipc/ipc.gyp:ipc' + ], + }], + ], }, # end of target 'remoting_simple_host' { @@ -732,16 +746,10 @@ 'sources': [ 'host/host_event_logger_win.cc', 'host/remoting_host_messages.mc', - 'host/session_event_executor_win.cc', - 'host/session_event_executor_win.h', ], 'include_dirs': [ '<(INTERMEDIATE_DIR)', ], - # Allow the host to connect to the remoting service. - 'defines': [ - 'USE_CHROMOTING_IPC', - ], # Rule to run the message compiler. 'rules': [ { @@ -1042,6 +1050,11 @@ 'run_all_unittests.cc', ], 'conditions': [ + [ 'OS=="win"', { + 'dependencies': [ + '../ipc/ipc.gyp:ipc' + ], + }], ['chromeos == 0', { 'dependencies': [ 'remoting_host' |