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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/remoting.gyp

Issue 145003019: More cleanups in remoting.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android Created 6 years, 11 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
« no previous file with comments | « no previous file | remoting/remoting_android.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 5368997e3ff56cef50f41f705501de3fbb602a94..3c9e6c79bd8b02d430d690a369f2008f8bab2700 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -268,7 +268,6 @@
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'remoting_base',
- 'remoting_jingle_glue',
'remoting_protocol',
'remoting_resources',
'../crypto/crypto.gyp:crypto',
@@ -294,6 +293,8 @@
'host/audio_silence_detector.h',
'host/basic_desktop_environment.cc',
'host/basic_desktop_environment.h',
+ 'host/branding.cc',
+ 'host/branding.h',
'host/capture_scheduler.cc',
'host/capture_scheduler.h',
'host/chromoting_host.cc',
@@ -322,9 +323,20 @@
'host/continue_window_gtk.cc',
'host/continue_window_mac.mm',
'host/continue_window_win.cc',
+ 'host/daemon_process.cc',
+ 'host/daemon_process.h',
+ 'host/daemon_process_win.cc',
'host/desktop_environment.h',
+ 'host/desktop_process.cc',
+ 'host/desktop_process.h',
'host/desktop_resizer.h',
'host/desktop_resizer_linux.cc',
+ 'host/desktop_session.cc',
+ 'host/desktop_session.h',
+ 'host/desktop_session_agent.cc',
+ 'host/desktop_session_agent.h',
+ 'host/desktop_session_win.cc',
+ 'host/desktop_session_win.h',
'host/desktop_resizer_mac.cc',
'host/desktop_resizer_win.cc',
'host/desktop_session_connector.h',
@@ -347,8 +359,12 @@
'host/host_change_notification_listener.h',
'host/host_config.cc',
'host/host_config.h',
+ 'host/host_event_logger.h',
+ 'host/host_event_logger_posix.cc',
+ 'host/host_event_logger_win.cc',
'host/host_exit_codes.cc',
'host/host_exit_codes.h',
+ 'host/host_export.h',
'host/host_secret.cc',
'host/host_secret.h',
'host/host_status_monitor.h',
@@ -397,6 +413,9 @@
'host/local_input_monitor_win.cc',
'host/log_to_server.cc',
'host/log_to_server.h',
+ 'host/logging.h',
+ 'host/logging_posix.cc',
+ 'host/logging_win.cc',
'host/me2me_desktop_environment.cc',
'host/me2me_desktop_environment.h',
'host/mouse_clamping_filter.cc',
@@ -514,6 +533,7 @@
],
'dependencies': [
'../sandbox/sandbox.gyp:sandbox',
+ 'remoting_host_messages',
],
'msvs_settings': {
'VCCLCompilerTool': {
@@ -522,6 +542,39 @@
'AdditionalOptions': ['/MP1'],
},
},
+ 'variables': {
+ 'output_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/host',
+ },
+ 'sources': [
+ '<(output_dir)/remoting_host_messages.mc',
+ ],
+ 'include_dirs': [
+ '<(output_dir)',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(output_dir)',
+ ],
+ },
+ 'rules': [{
+ # Rule to run the message compiler.
+ 'rule_name': 'message_compiler',
+ 'extension': 'mc',
+ 'inputs': [ '<(RULE_INPUT_PATH)' ],
+ 'outputs': [
+ '<(output_dir)/<(RULE_INPUT_ROOT).h',
+ '<(output_dir)/<(RULE_INPUT_ROOT).rc',
+ ],
+ 'action': [
+ 'mc.exe',
+ '-h', '<(output_dir)',
+ '-r', '<(output_dir)/.',
+ '-u',
+ '<(RULE_INPUT_PATH)',
+ ],
+ 'process_outputs_as_sources': 1,
+ 'message': 'Running message compiler on <(RULE_INPUT_PATH)',
+ }],
}],
],
}, # end of target 'remoting_host'
@@ -555,9 +608,7 @@
'remoting_base',
'remoting_breakpad',
'remoting_host',
- 'remoting_host_event_logger',
- 'remoting_host_logging',
- 'remoting_jingle_glue',
+ 'remoting_protocol',
],
'defines': [
'VERSION=<(version_full)',
@@ -644,12 +695,10 @@
'../third_party/npapi/npapi.gyp:npapi',
'remoting_base',
'remoting_host',
- 'remoting_host_event_logger',
- 'remoting_host_logging',
'remoting_host_setup_base',
'remoting_infoplist_strings',
'remoting_it2me_host_static',
- 'remoting_jingle_glue',
+ 'remoting_protocol',
'remoting_resources',
],
'sources': [
@@ -740,10 +789,8 @@
'../net/net.gyp:net',
'remoting_base',
'remoting_host',
- 'remoting_host_event_logger',
- 'remoting_host_logging',
'remoting_infoplist_strings',
- 'remoting_jingle_glue',
+ 'remoting_protocol',
'remoting_resources',
],
'defines': [
@@ -764,9 +811,9 @@
'../base/base.gyp:base',
'remoting_base',
'remoting_host',
- 'remoting_jingle_glue',
'remoting_it2me_host_static',
'remoting_native_messaging_base',
+ 'remoting_protocol',
],
'sources': [
'host/it2me/it2me_native_messaging_host_main.cc',
@@ -872,7 +919,7 @@
], # end of 'targets'
}], # 'enable_remoting_host==1'
- ['OS=="linux" and branding=="Chrome" and chromeos==0', {
+ ['OS=="linux" and branding=="Chrome" and enable_remoting_host==1', {
'variables': {
'build_deb_script': 'host/installer/linux/build-deb.sh',
'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", "<(DEPTH)"])',
@@ -942,7 +989,7 @@
],
},
],
- }], # OS=="linux" and branding=="Chrome" and chromeos==0
+ }], # OS=="linux" and branding=="Chrome"
['OS!="win" and enable_remoting_host==1', {
'targets': [
@@ -958,12 +1005,9 @@
'remoting_base',
'remoting_breakpad',
'remoting_host',
- 'remoting_host_event_logger',
- 'remoting_host_logging',
- 'remoting_host_setup_base',
'remoting_infoplist_strings',
- 'remoting_jingle_glue',
'remoting_me2me_host_static',
+ 'remoting_protocol',
],
'defines': [
'VERSION=<(version_full)',
@@ -1047,7 +1091,6 @@
'dependencies': [
'../base/base.gyp:base',
'remoting_host',
- 'remoting_host_logging',
'remoting_host_setup_base',
'remoting_native_messaging_base',
],
@@ -1063,10 +1106,9 @@
],
}, # end of target 'remoting_me2me_native_messaging_host'
], # end of 'targets'
- }], # 'OS!="win" and enable_remoting_host==1'
+ }], # OS!="win"
-
- ['OS=="linux" and chromeos==0 and enable_remoting_host==1', {
+ ['OS=="linux" and enable_remoting_host==1', {
'targets': [
# Linux breakpad processing
{
@@ -1342,7 +1384,7 @@
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'../base/base.gyp:base',
- 'remoting_host_logging',
+ 'remoting_host',
],
'sources': [
'tools/breakpad_tester_win.cc',
@@ -1378,8 +1420,7 @@
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.idl',
],
'action': [
- 'python',
- '<(version_py_path)',
+ 'python', '<(version_py_path)',
'-e', "DAEMON_CONTROLLER_CLSID='<(daemon_controller_clsid)'",
'-e', "RDP_DESKTOP_SESSION_CLSID='<(rdp_desktop_session_clsid)'",
'<(RULE_INPUT_PATH)',
@@ -1502,8 +1543,6 @@
'remoting_base',
'remoting_breakpad',
'remoting_host',
- 'remoting_host_event_logger',
- 'remoting_host_logging',
'remoting_host_setup_base',
'remoting_lib_idl',
'remoting_lib_ps',
@@ -1518,26 +1557,7 @@
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/chromoting_lib.rc',
'<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc',
'<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
- 'host/chromoting_messages.cc',
- 'host/chromoting_messages.h',
- 'host/config_file_watcher.cc',
- 'host/config_file_watcher.h',
- 'host/config_watcher.h',
- 'host/daemon_process.cc',
- 'host/daemon_process.h',
- 'host/daemon_process_win.cc',
- 'host/desktop_process.cc',
- 'host/desktop_process.h',
'host/desktop_process_main.cc',
- 'host/desktop_session.cc',
- 'host/desktop_session.h',
- 'host/desktop_session_agent.cc',
- 'host/desktop_session_agent.h',
- 'host/desktop_session_win.cc',
- 'host/desktop_session_win.h',
- 'host/host_exit_codes.h',
- 'host/host_exit_codes.cc',
- 'host/host_export.h',
'host/host_main.cc',
'host/host_main.h',
'host/ipc_constants.cc',
@@ -1921,20 +1941,20 @@
'HAVE_STDINT_H', # Required by on2_integer.h
],
'dependencies': [
- 'remoting_base',
- 'remoting_client',
- 'remoting_jingle_glue',
'../net/net.gyp:net',
'../ppapi/ppapi.gyp:ppapi_cpp_objects',
'../third_party/webrtc/modules/modules.gyp:desktop_capture',
'../ui/events/events.gyp:dom4_keycode_converter',
+ 'remoting_base',
+ 'remoting_client',
+ 'remoting_protocol',
],
'sources': [
'client/plugin/chromoting_instance.cc',
'client/plugin/chromoting_instance.h',
- 'client/plugin/normalizing_input_filter.cc',
'client/plugin/delegating_signal_strategy.cc',
'client/plugin/delegating_signal_strategy.h',
+ 'client/plugin/normalizing_input_filter.cc',
'client/plugin/normalizing_input_filter.h',
'client/plugin/normalizing_input_filter_cros.cc',
'client/plugin/normalizing_input_filter_mac.cc',
@@ -1960,66 +1980,13 @@
'client/plugin/pepper_view.h',
],
'conditions' : [
- [ '(OS!="linux" or chromeos==0)', {
+ [ 'chromeos==0', {
'sources!': [
'client/plugin/normalizing_input_filter_cros.cc',
],
}],
],
}, # end of target 'remoting_client_plugin'
- {
- 'target_name': 'remoting_host_event_logger',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'dependencies': [
- 'remoting_base',
- ],
- 'sources': [
- 'host/host_event_logger.h',
- 'host/host_event_logger_posix.cc',
- 'host/host_event_logger_win.cc',
- ],
- 'conditions': [
- ['OS=="win"', {
- 'dependencies': [
- 'remoting_host_messages',
- ],
- 'output_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/host',
- 'sources': [
- '<(_output_dir)/remoting_host_messages.mc',
- ],
- 'include_dirs': [
- '<(_output_dir)',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '<(_output_dir)',
- ],
- },
- 'rules': [
- # Rule to run the message compiler.
- {
- 'rule_name': 'message_compiler',
- 'extension': 'mc',
- 'inputs': [ ],
- 'outputs': [
- '<(_output_dir)/remoting_host_messages.h',
- '<(_output_dir)/remoting_host_messages.rc',
- ],
- 'action': [
- 'mc.exe',
- '-h', '<(_output_dir)',
- '-r', '<(_output_dir)/.',
- '-u',
- '<(RULE_INPUT_PATH)',
- ],
- 'process_outputs_as_sources': 1,
- 'message': 'Running message compiler on <(RULE_INPUT_PATH)',
- },
- ],
- }],
- ], # end of 'conditions'
- }, # end of target 'remoting_host_event_logger'
{
'target_name': 'remoting_webapp',
@@ -2220,8 +2187,7 @@
'<!@pymod_do_main(remoting_copy_locales -o -p <(OS) -x <(copy_output_dir) <(remoting_locales))'
],
'action': [
- 'python',
- 'tools/build/remoting_copy_locales.py',
+ 'python', 'tools/build/remoting_copy_locales.py',
'-p', '<(OS)',
'-g', '<(grit_out_dir)',
'-x', '<(copy_output_dir)/.',
@@ -2249,7 +2215,6 @@
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
'../media/media.gyp:media',
'../media/media.gyp:shared_memory_support',
- 'remoting_jingle_glue',
'remoting_resources',
'proto/chromotocol.gyp:chromotocol_proto_lib',
'../third_party/webrtc/modules/modules.gyp:desktop_capture',
@@ -2325,28 +2290,11 @@
}, # end of target 'remoting_base'
{
- 'target_name': 'remoting_host_logging',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'dependencies': [
- '../base/base.gyp:base',
- ],
- 'sources': [
- 'host/branding.cc',
- 'host/branding.h',
- 'host/logging.h',
- 'host/logging_posix.cc',
- 'host/logging_win.cc',
- ],
- }, # end of target 'remoting_host_logging'
-
- {
'target_name': 'remoting_client',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'remoting_base',
- 'remoting_jingle_glue',
'remoting_protocol',
'../third_party/libyuv/libyuv.gyp:libyuv',
'../third_party/webrtc/modules/modules.gyp:desktop_capture',
@@ -2378,14 +2326,17 @@
}, # end of target 'remoting_client'
{
- 'target_name': 'remoting_jingle_glue',
+ 'target_name': 'remoting_protocol',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'../base/base.gyp:base',
+ '../crypto/crypto.gyp:crypto',
'../jingle/jingle.gyp:jingle_glue',
'../jingle/jingle.gyp:notifier',
+ '../net/net.gyp:net',
'../third_party/libjingle/libjingle.gyp:libjingle',
+ 'remoting_base',
],
'export_dependent_settings': [
'../third_party/libjingle/libjingle.gyp:libjingle',
@@ -2403,24 +2354,6 @@
'jingle_glue/signal_strategy.h',
'jingle_glue/xmpp_signal_strategy.cc',
'jingle_glue/xmpp_signal_strategy.h',
- ],
- }, # end of target 'remoting_jingle_glue'
-
- {
- 'target_name': 'remoting_protocol',
- 'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
- 'dependencies': [
- 'remoting_base',
- 'remoting_jingle_glue',
- '../crypto/crypto.gyp:crypto',
- '../jingle/jingle.gyp:jingle_glue',
- '../net/net.gyp:net',
- ],
- 'export_dependent_settings': [
- 'remoting_jingle_glue',
- ],
- 'sources': [
'protocol/audio_reader.cc',
'protocol/audio_reader.h',
'protocol/audio_stub.h',
@@ -2544,6 +2477,7 @@
'../ppapi/ppapi.gyp:ppapi_cpp',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ '../third_party/webrtc/modules/modules.gyp:desktop_capture',
'../ui/gfx/gfx.gyp:gfx',
'../ui/gfx/gfx.gyp:gfx_geometry',
'../ui/ui.gyp:ui',
@@ -2552,14 +2486,11 @@
'remoting_client',
'remoting_client_plugin',
'remoting_host',
- 'remoting_host_event_logger',
'remoting_host_setup_base',
'remoting_it2me_host_static',
- 'remoting_jingle_glue',
'remoting_native_messaging_base',
'remoting_protocol',
'remoting_resources',
- '../third_party/webrtc/modules/modules.gyp:desktop_capture',
],
'defines': [
'VERSION=<(version_full)',
@@ -2600,23 +2531,14 @@
'host/chromoting_host_unittest.cc',
'host/client_session_unittest.cc',
'host/config_file_watcher_unittest.cc',
- 'host/daemon_process.cc',
- 'host/daemon_process.h',
'host/daemon_process_unittest.cc',
- 'host/desktop_process.cc',
- 'host/desktop_process.h',
'host/desktop_process_unittest.cc',
- 'host/desktop_session.cc',
- 'host/desktop_session.h',
'host/desktop_shape_tracker_unittest.cc',
- 'host/desktop_session_agent.cc',
- 'host/desktop_session_agent.h',
'host/heartbeat_sender_unittest.cc',
- 'host/host_status_sender_unittest.cc',
'host/host_change_notification_listener_unittest.cc',
'host/host_mock_objects.cc',
- 'host/host_mock_objects.h',
'host/host_status_monitor_fake.h',
+ 'host/host_status_sender_unittest.cc',
'host/ipc_desktop_environment_unittest.cc',
'host/it2me/it2me_native_messaging_host_unittest.cc',
'host/json_host_config_unittest.cc',
@@ -2740,12 +2662,12 @@
'remoting_client_plugin',
],
}],
- ['OS=="android" and gtest_target_type=="shared_library"', {
+ [ 'OS=="android" and gtest_target_type=="shared_library"', {
'dependencies': [
'../testing/android/native_test.gyp:native_test_native_code',
],
}],
- [ '(OS!="linux" or chromeos==0)', {
+ [ 'chromeos==0', {
'sources!': [
'client/plugin/normalizing_input_filter_cros_unittest.cc',
],
« no previous file with comments | « no previous file | remoting/remoting_android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698