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,
     # Use consistent strings across all platforms. Note that the plugin name
@@ skipping 1141 matching lines @@
         'host/event_executor.h',
         'host/event_executor_linux.cc',
         'host/event_executor_mac.cc',
         'host/event_executor_win.cc',
         'host/heartbeat_sender.cc',
         'host/heartbeat_sender.h',
         'host/gaia_oauth_client.cc',
         'host/gaia_oauth_client.h',
         'host/host_config.cc',
         'host/host_config.h',
+        'host/host_event_logger.h',
         'host/host_key_pair.cc',
         'host/host_key_pair.h',
         'host/host_port_allocator.cc',
         'host/host_port_allocator.h',
         'host/host_secret.cc',
         'host/host_secret.h',
         'host/host_status_observer.h',
         'host/host_user_interface.cc',
         'host/host_user_interface.h',
         'host/in_memory_host_config.cc',
@@ skipping 44 matching lines @@
         'host/user_authenticator.h',
         'host/user_authenticator_linux.cc',
         'host/user_authenticator_mac.cc',
         'host/user_authenticator_win.cc',
         'host/vlog_net_log.cc',
         'host/vlog_net_log.h',
         'host/x_server_pixel_buffer.cc',
         'host/x_server_pixel_buffer.h',
       ],
       'conditions': [
+        ['os_posix==1', {
+          'sources': [
+            'host/host_event_logger_posix.cc',
+          ],
+        }],
         ['OS=="linux"', {
           'link_settings': {
             'libraries': [
               '-lX11',
               '-lXdamage',
               '-lXfixes',
               '-lXtst',
               '-lpam',
               '-lXext'
             ],
@@ skipping 32 matching lines @@
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
             ],
           },
         }],
         ['OS=="win"', {
           'sources': [
             'host/chromoting_messages.cc',
             'host/chromoting_messages.h',
+            'host/host_event_logger_win.cc',
+            'host/remoting_host_messages.mc',

[alexeypa (please no reviews), 2012/07/19 17:05:00]

This should work, but it is a little bit tricky. The binaries including
remoting_host as a dependency will suddenly get the message table compiled from
remoting_host_messages.mc. The potential complications that I see are:

- There will be a comflict if a binary wants to use its own message table.
- The binary should be registered in the registry if it's message table is being
used to display messages in the Event Log.

+          ],
+          # 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).',
+            },
           ],
         }],
       ],
     },  # end of target 'remoting_host'
 
     {
       'target_name': 'remoting_client',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
@@ skipping 58 matching lines @@
         'remoting_host',
         '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',
             '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' "
                     "name='Microsoft.Windows.Common-Controls' "
@@ skipping 333 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }