Add HostEventLogger to It2Me host plugin.

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': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
     'remoting_audio': 0,
@@ skipping 512 matching lines @@
             '<(INTERMEDIATE_DIR)',
           ],
           'dependencies': [
             '../base/base.gyp:base',
             'remoting_breakpad',
             'remoting_elevated_controller',
             'remoting_protocol',
             'remoting_version_resources',
           ],
           'sources': [
+            '<(SHARED_INTERMEDIATE_DIR)/remoting/elevated_controller_version.rc',
             'host/branding.cc',
             'host/branding.h',
             'host/elevated_controller.rc',
             'host/elevated_controller_module_win.cc',
             'host/elevated_controller_win.cc',
             'host/elevated_controller_win.h',
             'host/pin_hash.cc',
             'host/pin_hash.h',
             'host/usage_stats_consent.h',
             'host/usage_stats_consent_win.cc',
             'host/verify_config_window_win.cc',
             'host/verify_config_window_win.h',
-            '<(SHARED_INTERMEDIATE_DIR)/remoting/elevated_controller_version.rc'
           ],
           'link_settings': {
             'libraries': [
               '-lcomctl32.lib',
             ],
           },
           'msvs_settings': {
             'VCLinkerTool': {
               'AdditionalOptions': [
                 "\"/manifestdependency:type='win32' "
@@ skipping 13 matching lines @@
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_static',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../ipc/ipc.gyp:ipc',
             'remoting_breakpad',
             'remoting_version_resources',
           ],
           'sources': [
+            '<(SHARED_INTERMEDIATE_DIR)/remoting/host_service_version.rc',
             'base/scoped_sc_handle_win.h',
             'host/branding.cc',
             'host/branding.h',
             'host/chromoting_messages.cc',
             'host/chromoting_messages.h',
             'host/constants.h',
             'host/constants_win.cc',
             'host/host_service.rc',
             'host/host_service_resource.h',
             'host/host_service_win.cc',
             'host/host_service_win.h',
             'host/launch_process_in_session_win.cc',
             'host/launch_process_in_session_win.h',
             'host/sas_injector.h',
             'host/sas_injector_win.cc',
             'host/usage_stats_consent.h',
             'host/usage_stats_consent_win.cc',
             'host/wts_console_monitor_win.h',
             'host/wts_console_observer_win.h',
             'host/wts_session_process_launcher_win.cc',
             'host/wts_session_process_launcher_win.h',
-            '<(SHARED_INTERMEDIATE_DIR)/remoting/host_service_version.rc'
           ],
           'msvs_settings': {
             'VCLinkerTool': {
               'AdditionalDependencies': [
                 'wtsapi32.lib',
               ],
             },
           },
         },  # end of target 'remoting_service'
 
@@ skipping 251 matching lines @@
         'client/plugin/pepper_view.cc',
         'client/plugin/pepper_view.h',
         'client/plugin/pepper_util.cc',
         'client/plugin/pepper_util.h',
         'client/plugin/pepper_xmpp_proxy.cc',
         'client/plugin/pepper_xmpp_proxy.h',
       ],
     },  # end of target 'remoting_client_plugin'
 
     {
+      'target_name': 'remoting_host_event_logger',

[Sergey Ulanov, 2012/07/27 21:59:53]

What's the reason this can't be part of remoting_host target?

[alexeypa (please no reviews), 2012/07/27 22:10:44]

1. We don't want this functionality to be present in the simple host.
2. Dependents of remoting_host_event_logger should not only add it to the
dependencies but also decide if they want the message table to be includes in
their resources. Blending remoting_host_event_logger into remoting_host will
make this even less obvious.

+      '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"', {
+          'sources': [
+            'host/remoting_host_messages.mc',
+          ],
+          'output_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/host',
+          'include_dirs': [
+            '<(_output_dir)',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '<(_output_dir)',
+            ],
+          },
+          # Rule to run the message compiler.
+          'rules': [
+            {
+              'rule_name': 'message_compiler',
+              'extension': 'mc',
+              'inputs': [ ],
+              'outputs': [
+                '<(_output_dir)/remoting_host_messages.h',
+                '<(_output_dir)/remoting_host_messages.rc',
+              ],
+              'msvs_cygwin_shell': 0,
+              'action': [
+                'mc.exe',
+                '-h', '<(_output_dir)',
+                '-r', '<(_output_dir)/.',
+                '<(RULE_INPUT_PATH)',
+              ],
+              'process_outputs_as_sources': 1,
+              'message': 'Running message compiler on <(RULE_INPUT_PATH).',
+            },
+          ],
+        }],
+      ],  # end of 'conditions'
+    },  # end of target 'remoting_client'

[Lambros, 2012/07/27 16:52:26]

nit: s/remoting_client/remoting_host_event_logger

+
+    {
       'target_name': 'remoting_host_plugin',
       'type': 'loadable_module',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'product_extension': '<(host_plugin_extension)',
       'product_prefix': '<(host_plugin_prefix)',
       'dependencies': [
         'remoting_base',
         'remoting_host',
+        'remoting_host_event_logger',
         'remoting_jingle_glue',
         '../net/net.gyp:net',
         '../third_party/npapi/npapi.gyp:npapi',
       ],
       'sources': [
         'base/dispatch_win.h',
         'host/branding.cc',
         'host/branding.h',
         'host/host_ui_resource.h',
         'host/plugin/daemon_controller.h',
@@ skipping 48 matching lines @@
           'dependencies': [
             '../google_update/google_update.gyp:google_update',
             '../ipc/ipc.gyp:ipc',
             'remoting_elevated_controller',
             'remoting_version_resources',
           ],
           'include_dirs': [
             '<(INTERMEDIATE_DIR)',
           ],
           'sources': [
+            '<(SHARED_INTERMEDIATE_DIR)/remoting/host_plugin_version.rc',
             'host/host_ui.rc',
             'host/plugin/host_plugin.def',
-            '<(SHARED_INTERMEDIATE_DIR)/remoting/host_plugin_version.rc'
           ],
         }],
       ],
     },  # end of target 'remoting_host_plugin'
 
     {
       'target_name': 'remoting_webapp',
       'type': 'none',
       'dependencies': [
         'remoting_host_plugin',
@@ skipping 390 matching lines @@
     },  # end of target 'remoting_simple_host'
 
     {
       'target_name': 'remoting_me2me_host',
       'type': 'executable',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         'remoting_base',
         'remoting_breakpad',
         'remoting_host',
+        'remoting_host_event_logger',
         'remoting_jingle_glue',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../media/media.gyp:media',
         '../net/net.gyp:net',
       ],
       'sources': [
         'host/branding.cc',
         'host/branding.h',
-        'host/host_event_logger.h',
         'host/sighup_listener_mac.cc',
         'host/sighup_listener_mac.h',
         'host/remoting_me2me_host.cc',
         'host/usage_stats_consent.h',
         'host/usage_stats_consent_win.cc',
       ],
       'conditions': [
-        ['os_posix==1', {
-          'sources': [
-            'host/host_event_logger_posix.cc',
-          ],
-        }],
         ['OS=="mac"', {
           'mac_bundle': 1,
           'conditions': [
             ['branding == "Chrome"', {
               'variables': {
                  'host_bundle_id': 'com.google.chrome_remote_desktop.remoting_me2me_host',
               },
             }, { # else branding!="Chrome"
               'variables': {
                 'host_bundle_id': 'org.chromium.chromoting.remoting_me2me_host',
@@ skipping 13 matching lines @@
           'mac_bundle_resources!': [
             'host/remoting_me2me_host-Info.plist',
           ],
         }],
         ['OS=="win"', {
           'dependencies': [
             '../ipc/ipc.gyp:ipc',
             'remoting_version_resources',
           ],
           'sources': [
-            'host/host_event_logger_win.cc',
+            '<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_me2me_host_version.rc',
             'host/host_ui.rc',
-            'host/remoting_host_messages.mc',
-            '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_me2me_host_version.rc'
-          ],
-          'include_dirs': [
-            '<(INTERMEDIATE_DIR)',
-          ],
-          # Rule to run the message compiler.
-          'rules': [
-            {
-              'rule_name': 'message_compiler',
-              'extension': 'mc',
-              'inputs': [ ],
-              'outputs': [
-                '<(INTERMEDIATE_DIR)/remoting_host_messages.h',
-                '<(INTERMEDIATE_DIR)/remoting_host_messages.rc',
-              ],
-              'msvs_cygwin_shell': 0,
-              'msvs_quote_cmd': 0,
-              'action': [
-                'mc.exe -h <(INTERMEDIATE_DIR) -r <(INTERMEDIATE_DIR) <(RULE_INPUT_PATH)',
-              ],
-              'process_outputs_as_sources': 1,
-              'message': 'Running message compiler on <(RULE_INPUT_PATH).',
-            },
           ],
           'link_settings': {
             'libraries': [
               '-lcomctl32.lib',
             ],
           },
           'msvs_settings': {
             'VCLinkerTool': {
               'AdditionalOptions': [
                 "\"/manifestdependency:type='win32' "
@@ skipping 333 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }