Cleanup: merging three different constants.h into a single header.

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
     # is brand-dependent and is defined further down.
-    # Must match host/plugin/constants.h
+    # Must match base/constants.h
     'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
     'host_plugin_description': 'Allow another user to access your computer securely over the Internet.',
 
     # The version is composed from major & minor versions specific to remoting
     # and build & patch versions inherited from Chrome.
     'version_py_path': '../chrome/tools/build/version.py',
     'version_path': '../remoting/VERSION',
     'chrome_version_path': '../chrome/VERSION',
     'version_full':
       '<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@.@MINOR@").'
@@ skipping 31 matching lines @@
       ['os_posix == 1 and OS != "mac" and target_arch == "arm"', {
         # linux 64 bit
         'host_plugin_extension': 'arm.so',
         'host_plugin_prefix': 'lib',
       }],
       ['OS=="win"', {
         'host_plugin_extension': 'dll',
         'host_plugin_prefix': '',
       }],
       ['branding=="Chrome"', {
-        # Must match host/plugin/constants.h
+        # Must match base/constants.h
         'host_plugin_name': 'Chrome Remote Desktop Host',
         'remoting_webapp_locale_files': [
           'webapp/_locales.official/ar/messages.json',
           'webapp/_locales.official/bg/messages.json',
           'webapp/_locales.official/ca/messages.json',
           'webapp/_locales.official/cs/messages.json',
           'webapp/_locales.official/da/messages.json',
           'webapp/_locales.official/de/messages.json',
           'webapp/_locales.official/el/messages.json',
           'webapp/_locales.official/en/messages.json',
@@ skipping 26 matching lines @@
           'webapp/_locales.official/sr/messages.json',
           'webapp/_locales.official/sv/messages.json',
           'webapp/_locales.official/th/messages.json',
           'webapp/_locales.official/tr/messages.json',
           'webapp/_locales.official/uk/messages.json',
           'webapp/_locales.official/vi/messages.json',
           'webapp/_locales.official/zh_CN/messages.json',
           'webapp/_locales.official/zh_TW/messages.json',
         ],
       }, {  # else: branding!="Chrome"
-        # Must match host/plugin/constants.h
+        # Must match base/constants.h
         'host_plugin_name': 'Chromoting Host',
         'remoting_webapp_locale_files': [
           'webapp/_locales/en/messages.json',
         ],
       }],
     ],
     'remoting_webapp_files': [
       'resources/icon_cross.png',
       'resources/icon_host.png',
       'resources/icon_pencil.png',
@@ skipping 380 matching lines @@
             '_ATL_APARTMENT_THREADED',
             '_ATL_NO_AUTOMATIC_NAMESPACE',
             '_ATL_CSTRING_EXPLICIT_CONSTRUCTORS',
             'STRICT',
           ],
           'include_dirs': [
             '<(INTERMEDIATE_DIR)',
           ],
           'dependencies': [
             '../base/base.gyp:base',
+            'remoting_base',

[simonmorris, 2012/06/18 20:30:12]

Is this necessary?

[alexeypa (please no reviews), 2012/06/18 20:34:02]

Yes. It needs values from constants.cc.

             'remoting_breakpad',
             'remoting_elevated_controller',
             'remoting_protocol',
             'remoting_version_resources',
           ],
           'sources': [
             'host/branding.cc',
             'host/branding.h',
             'host/elevated_controller.rc',
             'host/elevated_controller_module_win.cc',
@@ skipping 28 matching lines @@
         },  # end of target 'remoting_host_controller'
         {
           'target_name': 'remoting_service',
           'type': 'executable',
           '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_base',
             'remoting_breakpad',
             'remoting_version_resources',
           ],
           'sources': [
             '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/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',
@@ skipping 207 matching lines @@
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '../base/base.gyp:base',
       ],
       'sources': [
         'base/breakpad.h',
         'base/breakpad_linux.cc',
         'base/breakpad_mac.mm',
         'base/breakpad_win.cc',
-        'host/constants.h',
-        'host/constants_win.cc',
       ],
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
             '../breakpad/breakpad.gyp:breakpad_handler',
           ],
         }],
       ],
     },  # end of target 'remoting_breakpad'
 
@@ skipping 302 matching lines @@
         'host/chromoting_host.cc',
         'host/chromoting_host.h',
         'host/chromoting_host_context.cc',
         'host/chromoting_host_context.h',
         'host/client_session.cc',
         'host/client_session.h',
         'host/clipboard.h',
         'host/clipboard_linux.cc',
         'host/clipboard_mac.mm',
         'host/clipboard_win.cc',
-        'host/constants.h',
-        'host/constants_win.cc',
         'host/continue_window.h',
         'host/continue_window_gtk.cc',
         'host/continue_window_mac.mm',
         'host/continue_window_win.cc',
         'host/curtain.h',
         'host/curtain_linux.cc',
         'host/curtain_mac.cc',
         'host/curtain_win.cc',
         'host/desktop_environment.cc',
         'host/desktop_environment.h',
@@ skipping 632 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }