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

Unified Diff: remoting/remoting.gyp

Issue 9617027: Chromoting: Implemented security attention sequence (SAS) emulation on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased + a bunch of renamings Created 8 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 side-by-side diff with in-line comments
Download patch
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 285ff038dc0699317200bae1778c76006a542517..ee09b7b2ae258d6fe5d6f4adaabfff291e1785c6 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -234,6 +234,7 @@
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../media/media.gyp:media',
+ '../ipc/ipc.gyp:ipc',
],
'sources': [
'host/host_event_logger_win.cc',
@@ -279,13 +280,18 @@
'dependencies': [
'../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../ipc/ipc.gyp:ipc',
],
'sources': [
'base/scoped_sc_handle_win.h',
+ 'host/chromoting_messages.cc',
+ 'host/chromoting_messages.h',
'host/host_service.rc',
'host/host_service_resource.h',
'host/host_service_win.cc',
'host/host_service_win.h',
+ 'host/sas_injector_win.cc',
+ 'host/sas_injector_win.h',
'host/wts_console_monitor_win.h',
'host/wts_console_observer_win.h',
'host/wts_session_process_launcher_win.cc',
@@ -410,6 +416,11 @@
'host/plugin/host_plugin.rc',
],
}],
+ [ 'OS=="win"', {
Wez 2012/03/08 22:58:55 nit: Put this between OS=="mac" and OS!="win"?
alexeypa (please no reviews) 2012/03/09 01:13:54 Done.
+ 'dependencies': [
+ '../ipc/ipc.gyp:ipc'
Wez 2012/03/08 22:58:55 nit: It's a shame to have the plugin depend on IPC
alexeypa (please no reviews) 2012/03/09 01:13:54 I don't see a way to avoid it without major surger
Wez 2012/03/09 22:24:34 Yeah, I think we'd need to fix up DesktopEnvironme
+ ],
+ }],
],
}, # end of target 'remoting_host_plugin'
@@ -641,6 +652,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',
@@ -690,6 +703,12 @@
],
},
}],
+ ['OS=="win"', {
+ 'sources': [
+ 'host/chromoting_messages.cc',
+ 'host/chromoting_messages.h',
+ ],
+ }],
],
}, # end of target 'remoting_host'
@@ -750,6 +769,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'
{
@@ -1021,6 +1047,11 @@
'run_all_unittests.cc',
],
'conditions': [
+ [ 'OS=="win"', {
+ 'dependencies': [
+ '../ipc/ipc.gyp:ipc'
+ ],
+ }],
['chromeos == 0', {
'dependencies': [
'remoting_host'

Powered by Google App Engine
This is Rietveld 408576698