Add HostEventLogger to It2Me host plugin

remoting/remoting.gyp

Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 07c527288832f29da38dd900006813d835060271..ff93379a3c650a06b9abea2474e877daf441c8c5 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -1159,6 +1159,7 @@
         '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',
@@ -1223,6 +1224,11 @@
         'host/x_server_pixel_buffer.h',
       ],
       'conditions': [
+        ['os_posix==1', {
+          'sources': [
+            'host/host_event_logger_posix.cc',
+          ],
+        }],
         ['OS=="linux"', {
           'link_settings': {
             'libraries': [
@@ -1275,6 +1281,27 @@
           '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).',
+            },
           ],
         }],
       ],
@@ -1353,7 +1380,6 @@
       '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',
@@ -1361,11 +1387,6 @@
         'host/usage_stats_consent_win.cc',
       ],
       'conditions': [
-        ['os_posix==1', {
-          'sources': [
-            'host/host_event_logger_posix.cc',
-          ],
-        }],
         ['OS=="mac"', {
           'mac_bundle': 1,
           'conditions': [
@@ -1399,33 +1420,12 @@
             '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',