diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 00:26:35 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 00:26:35 +0000 |
| commit | d6227d881f835cb35f8e4f80f54b7db0562a9084 (patch) | |
| tree | 3c8a034b15875c617acb94ae4cadb7e8844489e6 /remoting/remoting.gyp | |
| parent | a03f2d3e4160a82380c0c92ac2b775cc4cfc04e6 (diff) | |
| download | chromium_src-d6227d881f835cb35f8e4f80f54b7db0562a9084.zip chromium_src-d6227d881f835cb35f8e4f80f54b7db0562a9084.tar.gz chromium_src-d6227d881f835cb35f8e4f80f54b7db0562a9084.tar.bz2 | |
Fixing the plugin crash when a user tries to share the screen (it2me).
BUG=117929
Review URL: https://chromiumcodereview.appspot.com/9677029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index adc4934..8992f30 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -340,11 +340,6 @@ }], ], # conditions }], # OS=="mac" - [ 'OS=="win"', { - 'dependencies': [ - '../ipc/ipc.gyp:ipc' - ], - }], ['OS!="win"', { 'sources!': [ 'host/plugin/host_plugin.def', @@ -582,8 +577,6 @@ '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', @@ -699,13 +692,6 @@ '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' { @@ -729,7 +715,7 @@ 'sources': [ 'host/host_event_logger_posix.cc', ], - }], + }], ['OS=="win"', { 'dependencies': [ '../ipc/ipc.gyp:ipc' @@ -737,10 +723,16 @@ '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': [ { @@ -1039,11 +1031,6 @@ 'run_all_unittests.cc', ], 'conditions': [ - [ 'OS=="win"', { - 'dependencies': [ - '../ipc/ipc.gyp:ipc' - ], - }], ['chromeos == 0', { 'dependencies': [ 'remoting_host' |