More cleanups in remoting.gyp

remoting/remoting.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'conditions': [
@@ skipping 250 matching lines @@
 
   'conditions': [
     ['enable_remoting_host==1', {
       'targets': [
         {
           'target_name': 'remoting_host',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             'remoting_base',
-            'remoting_jingle_glue',
             'remoting_protocol',
             'remoting_resources',
             '../crypto/crypto.gyp:crypto',
             '../google_apis/google_apis.gyp:google_apis',
             '../ipc/ipc.gyp:ipc',
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
             '../ui/events/events.gyp:dom4_keycode_converter',
           ],
           'defines': [
             'VERSION=<(version_full)',
           ],
           'sources': [
             'host/audio_capturer.cc',
             'host/audio_capturer.h',
             'host/audio_capturer_linux.cc',
             'host/audio_capturer_linux.h',
             'host/audio_capturer_mac.cc',
             'host/audio_capturer_win.cc',
             'host/audio_capturer_win.h',
             'host/audio_scheduler.cc',
             'host/audio_scheduler.h',
             'host/audio_silence_detector.cc',
             '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',
             'host/chromoting_host.h',
             'host/chromoting_host_context.cc',
             'host/chromoting_host_context.h',
             'host/chromoting_messages.cc',
             'host/chromoting_messages.h',
             'host/chromoting_param_traits.cc',
             'host/chromoting_param_traits.h',
             'host/client_session.cc',
             'host/client_session.h',
             'host/client_session_control.h',
             'host/clipboard.h',
             'host/clipboard_mac.mm',
             'host/clipboard_win.cc',
             'host/clipboard_x11.cc',
             'host/config_file_watcher.cc',
             'host/config_file_watcher.h',
             'host/config_watcher.h',
             'host/constants_mac.cc',
             'host/constants_mac.h',
             'host/continue_window.cc',
             'host/continue_window.h',
             'host/continue_window_aura.cc',
             'host/continue_window_gtk.cc',
             'host/continue_window_mac.mm',
             'host/continue_window_win.cc',
+            'host/daemon_process.cc',

[Lambros, 2014/01/25 00:31:59]

These files were Windows-only, but will now get pulled into all hosts on all
platforms. I guess it's OK because the buildbots were still compiling all these
files on all platforms anyway for remoting_unittests. And the linker should
discard this unused code when linking the host binaries. Still, it will slightly
lengthen the link time if you're just building a host. I assume we're OK with
this?

[Sergey Ulanov, 2014/01/25 01:24:16]

These files should be cross-platform, but we currently use them only on windows
and linker should strip unused code code from the binaries it produces.
Previously they were compiled twice on windows, which is wrong.

+            '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',
             'host/desktop_session_proxy.cc',
             'host/desktop_session_proxy.h',
             'host/desktop_shape_tracker.h',
             'host/desktop_shape_tracker_mac.cc',
             'host/desktop_shape_tracker_win.cc',
             'host/desktop_shape_tracker_x11.cc',
             'host/disconnect_window_aura.cc',
             'host/disconnect_window_gtk.cc',
             'host/disconnect_window_mac.h',
             'host/disconnect_window_mac.mm',
             'host/disconnect_window_win.cc',
             'host/dns_blackhole_checker.cc',
             'host/dns_blackhole_checker.h',
             'host/heartbeat_sender.cc',
             'host/heartbeat_sender.h',
             'host/host_change_notification_listener.cc',
             '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',
             'host/host_status_observer.h',
             'host/host_status_sender.cc',
             'host/host_status_sender.h',
             'host/host_window.h',
             'host/host_window_proxy.cc',
             'host/host_window_proxy.h',
             'host/in_memory_host_config.cc',
@@ skipping 28 matching lines @@
             'host/linux/x11_util.cc',
             'host/linux/x11_util.h',
             'host/linux/x_server_clipboard.cc',
             'host/linux/x_server_clipboard.h',
             'host/local_input_monitor.h',
             'host/local_input_monitor_linux.cc',
             'host/local_input_monitor_mac.mm',
             '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',
             'host/mouse_clamping_filter.h',
             'host/pairing_registry_delegate.cc',
             'host/pairing_registry_delegate.h',
             'host/pairing_registry_delegate_linux.cc',
             'host/pairing_registry_delegate_linux.h',
             'host/pairing_registry_delegate_mac.cc',
             'host/pairing_registry_delegate_win.cc',
@@ skipping 97 matching lines @@
                ],
               },
             }],
             ['OS=="win"', {
               'defines': [
                 '_ATL_NO_EXCEPTIONS',
                 'ISOLATION_AWARE_ENABLED=1',
               ],
               'dependencies': [
                 '../sandbox/sandbox.gyp:sandbox',
+                'remoting_host_messages',
               ],
               'msvs_settings': {
                 'VCCLCompilerTool': {
                   # /MP conflicts with #import directive so we limit the number
                   # of processes to spawn to 1.
                   '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'
 
         {
           'target_name': 'remoting_native_messaging_base',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
@@ skipping 13 matching lines @@
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
             '../net/net.gyp:net',
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
             'remoting_base',
             'remoting_breakpad',
             'remoting_host',
-            'remoting_host_event_logger',
-            'remoting_host_logging',
-            'remoting_jingle_glue',
+            'remoting_protocol',
           ],
           'defines': [
             'VERSION=<(version_full)',
           ],
           'sources': [
             'host/curtain_mode.h',
             'host/curtain_mode_linux.cc',
             'host/curtain_mode_mac.cc',
             'host/curtain_mode_win.cc',
             'host/posix/signal_handler.cc',
@@ skipping 66 matching lines @@
           'product_prefix': '<(host_plugin_prefix)',
           'defines': [
             'HOST_PLUGIN_MIME_TYPE=<(host_plugin_mime_type)',
           ],
           'dependencies': [
             '../base/base.gyp:base_i18n',
             '../net/net.gyp:net',
             '../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': [
             'base/dispatch_win.h',
             'host/plugin/host_log_handler.cc',
             'host/plugin/host_log_handler.h',
             'host/plugin/host_plugin.cc',
             'host/plugin/host_plugin_utils.cc',
             'host/plugin/host_plugin_utils.h',
             'host/plugin/host_script_object.cc',
@@ skipping 70 matching lines @@
         },  # end of target 'remoting_host_plugin'
         {
           'target_name': 'remoting_it2me_host_static',
           'type': 'static_library',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base_i18n',
             '../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': [
             'VERSION=<(version_full)',
           ],
           'sources': [
             'host/it2me/it2me_host.cc',
             'host/it2me/it2me_host.h',
             'host/it2me/it2me_native_messaging_host.cc',
             'host/it2me/it2me_native_messaging_host.h',
           ],
         },  # end of target 'remoting_it2me_host_static'
         {
           'target_name': 'remoting_it2me_native_messaging_host',
           'type': 'executable',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             'remoting_base',
             'remoting_host',
-            'remoting_jingle_glue',
             'remoting_it2me_host_static',
             'remoting_native_messaging_base',
           ],
           'sources': [
             'host/it2me/it2me_native_messaging_host_main.cc',
           ],
           'conditions': [
             ['OS=="linux" and linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
@@ skipping 87 matching lines @@
               '--template', '<(RULE_INPUT_PATH)',
               '--locale_output',
               '<(SHARED_INTERMEDIATE_DIR)/remoting/<(RULE_INPUT_ROOT)/@{json_suffix}.lproj/InfoPlist.strings',
               '<@(remoting_locales)',
             ]},
           ],
         },  # end of target 'remoting_infoplist_strings'
       ],  # end of 'targets'
     }],  # 'enable_remoting_host==1'
 
-    ['OS=="linux" and branding=="Chrome" and chromeos==0', {
+    ['OS=="linux" and branding=="Chrome"', {
       'variables': {
         'build_deb_script': 'host/installer/linux/build-deb.sh',
         'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", "<(DEPTH)"])',
         'packaging_outputs': [
           '<(deb_filename)',
           '<!(echo <(deb_filename) | sed -e "s/.deb$/.changes/")',
           '<(PRODUCT_DIR)/remoting_me2me_host.debug',
           '<(PRODUCT_DIR)/remoting_start_host.debug',
           '<(PRODUCT_DIR)/remoting_native_messaging_host.debug',
         ]
@@ skipping 49 matching lines @@
                 'host/installer/linux/debian/rules',
               ],
               'outputs': [
                 '<@(packaging_outputs)',
               ],
               'action': [ '<(build_deb_script)', '-s', '<(DEPTH)' ],
             },
           ],
         },
       ],
-    }],  # OS=="linux" and branding=="Chrome" and chromeos==0
+    }],  # OS=="linux" and branding=="Chrome"
 
-    ['OS!="win" and enable_remoting_host==1', {
+    ['OS!="win"', {
       'targets': [
         {
           'target_name': 'remoting_me2me_host',
           'type': 'executable',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
             '../net/net.gyp:net',
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
             '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)',
           ],
           'sources': [
             'host/host_main.cc',
             'host/host_main.h',
             'host/remoting_me2me_host.cc',
           ],
           'conditions': [
@@ skipping 63 matching lines @@
           ],  # end of 'conditions'
         },  # end of target 'remoting_me2me_host'
         {
           'target_name': 'remoting_me2me_native_messaging_host',
           'type': 'executable',
           'product_name': 'remoting_native_messaging_host',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             'remoting_host',
-            'remoting_host_logging',
             'remoting_host_setup_base',
             'remoting_native_messaging_base',
           ],
           'sources': [
             'host/setup/me2me_native_messaging_host_main.cc',
           ],
           'conditions': [
             ['OS=="linux" and linux_use_tcmalloc==1', {
               'dependencies': [
                 '../base/allocator/allocator.gyp:allocator',
               ],
             }],
           ],
         },  # 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 chromeos==0', {
       'targets': [
         # Linux breakpad processing
         {
           'target_name': 'remoting_linux_symbols',
           'type': 'none',
           'conditions': [
             ['linux_dump_symbols==1', {
               'actions': [
                 {
                   'action_name': 'dump_symbols',
@@ skipping 255 matching lines @@
     }],  # 'OS=="mac"'
 
     ['OS=="win"', {
       'targets': [
         {
           'target_name': 'remoting_breakpad_tester',
           'type': 'executable',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
-            'remoting_host_logging',
+            'remoting_host',
           ],
           'sources': [
             'tools/breakpad_tester_win.cc',
           ],
         },  # end of target 'remoting_breakpad_tester'
         {
           'target_name': 'remoting_lib_idl',
           'type': 'static_library',
           'sources': [
             'host/win/chromoting_lib_idl.templ',
@@ skipping 15 matching lines @@
             ],
           },
           'rules': [
             {
               'rule_name': 'generate_idl',
               'extension': 'templ',
               'outputs': [
                 '<(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)',
                 '<@(_outputs)',
               ],
               'process_outputs_as_sources': 1,
               'message': 'Generating <@(_outputs)',
             },
           ],
         },  # end of target 'remoting_lib_idl'
@@ skipping 102 matching lines @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_static',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../ipc/ipc.gyp:ipc',
             '../net/net.gyp:net',
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
             'remoting_base',
             'remoting_breakpad',
             'remoting_host',
-            'remoting_host_event_logger',
-            'remoting_host_logging',
             'remoting_host_setup_base',
             'remoting_lib_idl',
             'remoting_lib_ps',
             'remoting_lib_rc',
             'remoting_me2me_host_static',
             'remoting_native_messaging_base',
             'remoting_protocol',
             'remoting_windows_resources',
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/remoting/core.rc',
             '<(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',
             'host/ipc_constants.h',
             'host/remoting_me2me_host.cc',
             'host/sas_injector.h',
             'host/sas_injector_win.cc',
             'host/setup/me2me_native_messaging_host_main.cc',
             'host/verify_config_window_win.cc',
             'host/verify_config_window_win.h',
@@ skipping 363 matching lines @@
     },  # end of target 'remoting_breakpad'
 
     {
       'target_name': 'remoting_client_plugin',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'defines': [
         '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',
         'client/plugin/pepper_audio_player.cc',
         'client/plugin/pepper_audio_player.h',
         'client/plugin/pepper_entrypoints.cc',
         'client/plugin/pepper_entrypoints.h',
         'client/plugin/pepper_input_handler.cc',
         'client/plugin/pepper_input_handler.h',
         'client/plugin/pepper_network_manager.cc',
         'client/plugin/pepper_network_manager.h',
         'client/plugin/pepper_packet_socket_factory.cc',
         'client/plugin/pepper_packet_socket_factory.h',
         'client/plugin/pepper_plugin_thread_delegate.cc',
         'client/plugin/pepper_plugin_thread_delegate.h',
         'client/plugin/pepper_port_allocator.cc',
         'client/plugin/pepper_port_allocator.h',
         'client/plugin/pepper_token_fetcher.cc',
         'client/plugin/pepper_token_fetcher.h',
         'client/plugin/pepper_util.cc',
         'client/plugin/pepper_util.h',
         'client/plugin/pepper_view.cc',
         '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',
       'type': 'none',
       'variables': {
         'remoting_webapp_patch_files': [
           'webapp/appsv2.patch',
         ],
         'remoting_webapp_apps_v2_js_files': [
           'webapp/background.js',
@@ skipping 180 matching lines @@
             'copy_output_dir%': '<(PRODUCT_DIR)',
           },
           'inputs': [
             'tools/build/remoting_copy_locales.py',
             '<!@pymod_do_main(remoting_copy_locales -i -p <(OS) -g <(grit_out_dir) <(remoting_locales))'
           ],
           'outputs': [
             '<!@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)/.',
             '<@(remoting_locales)',
           ],
         }
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },  # end of target 'remoting_resources'
 
     {
       'target_name': 'remoting_base',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/ui.gyp:ui',
         '../net/net.gyp:net',
         '../third_party/libvpx/libvpx.gyp:libvpx',
         '../third_party/libyuv/libyuv.gyp:libyuv',
         '../third_party/opus/opus.gyp:opus',
         '../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',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         'proto/chromotocol.gyp:chromotocol_proto_lib',
       ],
@@ skipping 55 matching lines @@
         'codec/video_decoder_vpx.h',
         'codec/video_encoder.h',
         'codec/video_encoder_verbatim.cc',
         'codec/video_encoder_verbatim.h',
         'codec/video_encoder_vpx.cc',
         'codec/video_encoder_vpx.h',
       ],
     },  # 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',
       ],
       'sources': [
         'client/audio_decode_scheduler.cc',
         'client/audio_decode_scheduler.h',
         'client/audio_player.cc',
         'client/audio_player.h',
         'client/chromoting_client.cc',
@@ skipping 11 matching lines @@
         'client/frame_producer.h',
         'client/key_event_mapper.cc',
         'client/key_event_mapper.h',
         'client/software_video_renderer.cc',
         'client/software_video_renderer.h',
         'client/video_renderer.h',
       ],
     },  # 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',
       ],
       'sources': [
         'jingle_glue/chromium_port_allocator.cc',
         'jingle_glue/chromium_port_allocator.h',
         'jingle_glue/chromium_socket_factory.cc',
         'jingle_glue/chromium_socket_factory.h',
         'jingle_glue/iq_sender.cc',
         'jingle_glue/iq_sender.h',
         'jingle_glue/jingle_info_request.cc',
         'jingle_glue/jingle_info_request.h',
         'jingle_glue/network_settings.h',
         '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',
         'protocol/audio_writer.cc',
         'protocol/audio_writer.h',
         'protocol/auth_util.cc',
         'protocol/auth_util.h',
         'protocol/authentication_method.cc',
         'protocol/authentication_method.h',
         'protocol/authenticator.cc',
@@ skipping 103 matching lines @@
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net_test_support',
         '../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',
         'remoting_base',
         'remoting_breakpad',
         '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)',
       ],
       'include_dirs': [
         '../testing/gmock/include',
       ],
       'sources': [
         '../chrome/test/base/run_all_remoting_unittests.cc',
         'base/auth_token_util_unittest.cc',
@@ skipping 20 matching lines @@
         'codec/video_encoder_verbatim_unittest.cc',
         'codec/video_encoder_vpx_unittest.cc',
         'host/audio_silence_detector_unittest.cc',
         'host/branding.cc',
         'host/branding.h',
         'host/capture_scheduler_unittest.cc',
         'host/chromoting_host_context_unittest.cc',
         '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',
         'host/linux/x_server_clipboard_unittest.cc',
         'host/local_input_monitor_unittest.cc',
         'host/log_to_server_unittest.cc',
         'host/native_messaging/native_messaging_reader_unittest.cc',
         'host/native_messaging/native_messaging_writer_unittest.cc',
         'host/pairing_registry_delegate_linux_unittest.cc',
         'host/pairing_registry_delegate_win_unittest.cc',
@@ skipping 103 matching lines @@
             'webapp/all_js_load.gtestjs',
             'webapp/format_iq.gtestjs',
             '<@(remoting_webapp_js_files)',
           ],
         }],
         [ 'OS=="android"', {
           'dependencies!': [
             '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',
           ],
         }],
         ['enable_remoting_host == 0', {
           'dependencies!': [
             'remoting_host',
             'remoting_host_setup_base',
             'remoting_it2me_host_static',
             'remoting_native_messaging_base',
@@ skipping 19 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],  # end of 'toolkit_uses_gtk == 1'
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }