Localized Chromoting Host on Mac and Linux.

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 25 matching lines @@
     'version_minor':
       '<!(python <(version_py_path) -f <(remoting_version_path) -t "@REMOTING_PATCH@")',
     'version_short':
       '<(version_major).<(version_minor).'
       '<!(python <(version_py_path) -f <(chrome_version_path) -f <(remoting_version_path) -t "@BUILD@")',
     'version_full':
       '<(version_short).'
       '<!(python <(version_py_path) -f <(chrome_version_path) -f <(remoting_version_path) -t "@PATCH@")',
 
     'branding_path': '../remoting/branding_<(branding)',
-    'copyright_info': '<!(python <(version_py_path) -f <(branding_path) -t "@COPYRIGHT@")',
 
     'webapp_locale_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/webapp/_locales',
 
-    # Use consistent strings across all platforms.
-    # These values must match host/plugin/constants.h
     'host_plugin_mime_type': 'application/vnd.chromium.remoting-host',
-    'host_plugin_description': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_DESCRIPTION@")',
-    'host_plugin_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_NAME@")',
 
     'conditions': [
       # Remoting host is supported only on Windows, OSX and Linux (with X11).
       ['OS=="win" or OS=="mac" or (OS=="linux" and chromeos==0 and use_x11==1)', {
         'enable_remoting_host': 1,
       }, {
         'enable_remoting_host': 0,
       }],
       ['OS=="mac"', {
         'mac_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_BUNDLE_ID@")',
@@ skipping 28 matching lines @@
         # classes will be used during/after upgrade even if there are old
         # instances running already.
         # The parameter passed to uuidgen.py is ignored, but needed to make sure
         # that the script will be invoked separately for each CLSID. Otherwise
         # GYP will reuse the value returned by the first invocation of
         # the script.
         'daemon_controller_clsid': '<!(python tools/uuidgen.py 1)',
         'rdp_desktop_session_clsid': '<!(python tools/uuidgen.py 2)',
       }],
     ],
+
     'remoting_locales': [
       'ar', 'bg', 'ca', 'cs', 'da', 'de', 'el', 'en', 'en-GB', 'es',
       'es-419', 'et', 'fi', 'fil', 'fr', 'he', 'hi', 'hr', 'hu', 'id',
       'it', 'ja', 'ko', 'lt', 'lv', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT',
       'ro', 'ru', 'sk', 'sl', 'sr', 'sv', 'th', 'tr', 'uk', 'vi',
       'zh-CN', 'zh-TW',
     ],
+    'remoting_locale_files': [
+      # Build the list of .pak files generated from remoting_strings.grd.
+      '<!@pymod_do_main(remoting_copy_locales -o -p <(OS) -x '
+          '<(PRODUCT_DIR) <(remoting_locales))',
+    ],
     'remoting_webapp_locale_files': [
       # Build the list of .json files generated from remoting_strings.grd.
       '<!@pymod_do_main(remoting_localize --locale_output '
-          '"<(webapp_locale_dir)/${json_suffix}/messages.json" '
+          '"<(webapp_locale_dir)/@{json_suffix}/messages.json" '
           '--print_only <(remoting_locales))',
     ],
     'remoting_webapp_files': [
       'resources/chromoting16.webp',
       'resources/chromoting48.webp',
       'resources/chromoting128.webp',
       'resources/disclosure_arrow_down.webp',
       'resources/disclosure_arrow_right.webp',
       'resources/host_setup_instructions.webp',
       'resources/icon_cross.webp',
@@ skipping 138 matching lines @@
     ['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',
           ],
           'defines': [
             'VERSION=<(version_full)',
           ],
           'sources': [
             'host/audio_capturer.cc',
@@ skipping 140 matching lines @@
             'host/server_log_entry.cc',
             'host/server_log_entry.h',
             'host/service_urls.cc',
             'host/service_urls.h',
             'host/session_manager_factory.cc',
             'host/session_manager_factory.h',
             'host/signaling_connector.cc',
             'host/signaling_connector.h',
             'host/token_validator_factory_impl.cc',
             'host/token_validator_factory_impl.h',
-            'host/ui_strings.cc',
-            'host/ui_strings.h',
             'host/usage_stats_consent.h',
             'host/usage_stats_consent_mac.cc',
             'host/usage_stats_consent_win.cc',
             'host/video_scheduler.cc',
             'host/video_scheduler.h',
             'host/win/com_security.cc',
             'host/win/com_security.h',
             'host/win/launch_process_with_token.cc',
             'host/win/launch_process_with_token.h',
             'host/win/omaha.cc',
@@ skipping 188 matching lines @@
             }],
           ],
         },  # end of target 'remoting_host_setup_base'
 
         {
           'target_name': 'remoting_host_plugin',
           'type': 'loadable_module',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'product_extension': '<(host_plugin_extension)',
           '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_infoplist_strings',
             'remoting_host_setup_base',
             'remoting_jingle_glue',
+            'remoting_resources',
           ],
           'sources': [
-            '<(SHARED_INTERMEDIATE_DIR)/remoting/core.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
             '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',
             'host/plugin/host_script_object.h',
             'host/win/core_resource.h',
           ],
           'conditions': [
             ['OS=="mac"', {
               'mac_bundle': 1,
               'xcode_settings': {
                 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
                 'INFOPLIST_FILE': 'host/plugin/host_plugin-Info.plist',
                 'INFOPLIST_PREPROCESS': 'YES',
                 # TODO(maruel): Use INFOPLIST_PREFIX_HEADER to remove the need to
                 # duplicate string once
                 # http://code.google.com/p/gyp/issues/detail?id=243 is fixed.
-                'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'HOST_PLUGIN_MIME_TYPE="<(host_plugin_mime_type)" HOST_PLUGIN_NAME="<(host_plugin_name)" HOST_PLUGIN_DESCRIPTION="<(host_plugin_description)"',
+                'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'HOST_PLUGIN_MIME_TYPE="<(host_plugin_mime_type)" VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)"',
               },
               # TODO(mark): Come up with a fancier way to do this.  It should
               # only be necessary to list host_plugin-Info.plist once, not the
               # three times it is listed here.
               'mac_bundle_resources': [
                 'host/disconnect_window.xib',
                 'host/plugin/host_plugin-Info.plist',
                 'resources/chromoting16.png',
                 'resources/chromoting48.png',
                 'resources/chromoting128.png',
+                '<!@pymod_do_main(remoting_copy_locales -o -p <(OS) -x <(PRODUCT_DIR) <(remoting_locales))',
+
+                # Localized strings for 'Info.plist'
+                '<!@pymod_do_main(remoting_localize --locale_output '
+                    '"<(SHARED_INTERMEDIATE_DIR)/remoting/host_plugin_resources/@{json_suffix}.lproj/InfoPlist.strings" '
+                    '--print_only <(remoting_locales))',
               ],
               'mac_bundle_resources!': [
                 'host/plugin/host_plugin-Info.plist',
               ],
               'conditions': [
                 ['mac_breakpad==1', {
                   'variables': {
                     # A real .dSYM is needed for dump_syms to operate on.
                     'mac_real_dsym': 1,
                   },
                 }],
               ],  # conditions
             }],  # OS=="mac"
             [ 'OS=="win"', {
               'defines': [
                 'BINARY=BINARY_HOST_PLUGIN',
                 'ISOLATION_AWARE_ENABLED=1',
               ],
               'dependencies': [
                 'remoting_lib_idl',
                 'remoting_core_resources',
                 'remoting_version_resources',
               ],
               'include_dirs': [
                 '<(INTERMEDIATE_DIR)',
               ],
               'sources': [
+                '<(SHARED_INTERMEDIATE_DIR)/remoting/core.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
                 'host/plugin/host_plugin.def',
               ],
               'msvs_settings': {
                 'VCManifestTool': {
                   'EmbedManifest': 'true',
                 },
                 'VCLinkerTool': {
                   'AdditionalOptions': [
                     "\"/manifestdependency:type='win32' "
                         "name='Microsoft.Windows.Common-Controls' "
                         "version='6.0.0.0' "
                         "processorArchitecture='*' "
                         "publicKeyToken='6595b64144ccf1df' language='*'\"",
                   ],
                 },
               },
             }],
           ],
         },  # end of target 'remoting_host_plugin'
+        {
+          'target_name': 'remoting_infoplist_strings',
+          'type': 'none',
+          'dependencies': [
+            'remoting_resources',
+          ],
+          'actions': [
+            {
+              'action_name': 'generate_host_plugin_strings',
+              'inputs': [
+                '<(remoting_localize_path)',
+                'host/plugin/host_plugin-InfoPlist.strings.jinja2',
+              ],
+              'outputs': [
+                '<!@pymod_do_main(remoting_localize --locale_output '
+                    '"<(SHARED_INTERMEDIATE_DIR)/remoting/host_plugin_resources/@{json_suffix}.lproj/InfoPlist.strings" '
+                    '--print_only <(remoting_locales))',
+              ],
+              'action': [
+                'python',
+                '<(remoting_localize_path)',
+                '--locale_dir', '<(webapp_locale_dir)',
+                '--template', 'host/plugin/host_plugin-InfoPlist.strings.jinja2',
+                '--locale_output',
+                '<(SHARED_INTERMEDIATE_DIR)/remoting/host_plugin_resources/@{json_suffix}.lproj/InfoPlist.strings',
+                '--encoding', 'utf-8',
+                '<@(remoting_locales)',
+              ],
+            },
+            {
+              'action_name': 'generate_host_strings',
+              'inputs': [
+                '<(remoting_localize_path)',
+                'host/remoting_me2me_host-InfoPlist.strings.jinja2',
+              ],
+              'outputs': [
+                '<!@pymod_do_main(remoting_localize --locale_output '
+                    '"<(SHARED_INTERMEDIATE_DIR)/remoting/host_resources/@{json_suffix}.lproj/InfoPlist.strings" '
+                    '--print_only <(remoting_locales))',
+              ],
+              'action': [
+                'python',
+                '<(remoting_localize_path)',
+                '--locale_dir', '<(webapp_locale_dir)',
+                '--template', 'host/remoting_me2me_host-InfoPlist.strings.jinja2',
+                '--locale_output',
+                '<(SHARED_INTERMEDIATE_DIR)/remoting/host_resources/@{json_suffix}.lproj/InfoPlist.strings',
+                '--encoding', 'utf-8',
+                '<@(remoting_locales)',
+              ],
+            },
+            {
+              'action_name': 'generate_preference_pane_strings',
+              'inputs': [
+                '<(remoting_localize_path)',
+                'host/mac/me2me_preference_pane-InfoPlist.strings.jinja2',
+              ],
+              'outputs': [
+                '<!@pymod_do_main(remoting_localize --locale_output '
+                    '"<(SHARED_INTERMEDIATE_DIR)/remoting/preference_pane_resources/@{json_suffix}.lproj/InfoPlist.strings" '
+                    '--print_only <(remoting_locales))',
+              ],
+              'action': [
+                'python',
+                '<(remoting_localize_path)',
+                '--locale_dir', '<(webapp_locale_dir)',
+                '--template', 'host/mac/me2me_preference_pane-InfoPlist.strings.jinja2',
+                '--locale_output',
+                '<(SHARED_INTERMEDIATE_DIR)/remoting/preference_pane_resources/@{json_suffix}.lproj/InfoPlist.strings',
+                '--encoding', 'utf-8',
+                '<@(remoting_locales)',
+              ],
+            },
+            {
+              'action_name': 'generate_uninstaller_strings',
+              'inputs': [
+                '<(remoting_localize_path)',
+                'host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2',
+              ],
+              'outputs': [
+                '<!@pymod_do_main(remoting_localize --locale_output '
+                    '"<(SHARED_INTERMEDIATE_DIR)/remoting/uninstaller_resources/@{json_suffix}.lproj/InfoPlist.strings" '
+                    '--print_only <(remoting_locales))',
+              ],
+              'action': [
+                'python',
+                '<(remoting_localize_path)',
+                '--locale_dir', '<(webapp_locale_dir)',
+                '--template', 'host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2',
+                '--locale_output',
+                '<(SHARED_INTERMEDIATE_DIR)/remoting/uninstaller_resources/@{json_suffix}.lproj/InfoPlist.strings',
+                '--encoding', 'utf-8',
+                '<@(remoting_locales)',
+              ],
+            },
+          ],
+        },  # end of target 'remoting_infoplist_strings'
 
         {
           'target_name': 'remoting_native_messaging_host',
           'type': 'executable',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             'remoting_host',
             'remoting_host_logging',
             'remoting_host_setup_base',
@@ skipping 97 matching lines @@
           '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_infoplist_strings',
             'remoting_jingle_glue',
             'remoting_me2me_host_static',
           ],
           'defines': [
             'VERSION=<(version_full)',
           ],
           'sources': [
             'host/host_main.cc',
             'host/host_main.h',
             'host/remoting_me2me_host.cc',
           ],
           'conditions': [
             ['OS=="mac"', {
               'mac_bundle': 1,
               'variables': {
                  'host_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_ID@")',
               },
               'xcode_settings': {
                 'INFOPLIST_FILE': 'host/remoting_me2me_host-Info.plist',
                 'INFOPLIST_PREPROCESS': 'YES',
-                'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)" COPYRIGHT_INFO="<(copyright_info)"',
+                'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)"',
               },
               'mac_bundle_resources': [
                 'host/disconnect_window.xib',
                 'host/remoting_me2me_host.icns',
                 'host/remoting_me2me_host-Info.plist',
+                '<!@pymod_do_main(remoting_copy_locales -o -p <(OS) -x <(PRODUCT_DIR) <(remoting_locales))',
+
+                # Localized strings for 'Info.plist'
+                '<!@pymod_do_main(remoting_localize --locale_output '
+                    '"<(SHARED_INTERMEDIATE_DIR)/remoting/host_resources/@{json_suffix}.lproj/InfoPlist.strings" '
+                    '--print_only <(remoting_locales))',
               ],
               'mac_bundle_resources!': [
                 'host/remoting_me2me_host-Info.plist',
               ],
               'conditions': [
                 ['mac_breakpad==1', {
                   'variables': {
                     # A real .dSYM is needed for dump_syms to operate on.
                     'mac_real_dsym': 1,
                   },
@@ skipping 96 matching lines @@
     }],  # 'OS=="linux"'
 
     ['OS=="mac"', {
       'targets': [
         {
           'target_name': 'remoting_host_uninstaller',
           'type': 'executable',
           'mac_bundle': 1,
           'variables': {
             'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_BUNDLE_ID@")',
-            'bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_BUNDLE_NAME@")',
           },
           'dependencies': [
             '<(DEPTH)/base/base.gyp:base',
+            'remoting_infoplist_strings',
           ],
           'sources': [
             'host/constants_mac.cc',
             'host/constants_mac.h',
             'host/installer/mac/uninstaller/remoting_uninstaller.h',
             'host/installer/mac/uninstaller/remoting_uninstaller.mm',
             'host/installer/mac/uninstaller/remoting_uninstaller_app.h',
             'host/installer/mac/uninstaller/remoting_uninstaller_app.mm',
           ],
           'xcode_settings': {
             'INFOPLIST_FILE': 'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
             'INFOPLIST_PREPROCESS': 'YES',
-            'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_NAME="<(bundle_name)" BUNDLE_ID="<(bundle_id)" COPYRIGHT_INFO="<(copyright_info)"',
+            'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(bundle_id)"',
           },
           'mac_bundle_resources': [
             'host/installer/mac/uninstaller/remoting_uninstaller.icns',
             'host/installer/mac/uninstaller/remoting_uninstaller.xib',
             'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
+
+            # Localized strings for 'Info.plist'
+            '<!@pymod_do_main(remoting_localize --locale_output '
+                '"<(SHARED_INTERMEDIATE_DIR)/remoting/uninstaller_resources/@{json_suffix}.lproj/InfoPlist.strings" '
+                '--print_only <(remoting_locales))',
           ],
           'mac_bundle_resources!': [
             'host/installer/mac/uninstaller/remoting_uninstaller-Info.plist',
           ],
         },  # end of target 'remoting_host_uninstaller'
 
         # This packages up the files needed for the remoting host installer so
         # they can be sent off to be signed.
         # We don't build an installer here because we don't have signed binaries.
         {
@@ skipping 31 matching lines @@
                 'Applications/<(host_uninstaller_name).app',
               ],
               'source_files': [
                 '<@(remoting_host_installer_mac_files)',
               ],
               'defs': [
                 'VERSION=<(version_full)',
                 'VERSION_SHORT=<(version_short)',
                 'VERSION_MAJOR=<(version_major)',
                 'VERSION_MINOR=<(version_minor)',
-                'COPYRIGHT_INFO=<(copyright_info)',
                 'HOST_NAME=<(host_name)',
                 'HOST_SERVICE_NAME=<(host_service_name)',
                 'HOST_UNINSTALLER_NAME=<(host_uninstaller_name)',
                 'HOST_PKG=<(host_name)',
                 'HOST_SERVICE_PKG=<(host_service_name_nospace)',
                 'HOST_UNINSTALLER_PKG=<(host_uninstaller_name_nospace)',
                 'BUNDLE_ID_HOST=<(bundle_prefix).<(host_name_nospace)',
                 'BUNDLE_ID_HOST_SERVICE=<(bundle_prefix).<(host_service_name_nospace)',
                 'BUNDLE_ID_HOST_UNINSTALLER=<(bundle_prefix).<(host_uninstaller_name_nospace)',
                 'DMG_VOLUME_NAME=<(host_name) <(version_full)',
@@ skipping 27 matching lines @@
         }, # end of target 'remoting_me2me_host_archive'
 
         {
           'target_name': 'remoting_host_prefpane',
           'type': 'loadable_module',
           'mac_bundle': 1,
           'product_extension': 'prefPane',
           'defines': [
             'JSON_USE_EXCEPTION=0',
           ],
+          'dependencies': [
+            'remoting_infoplist_strings',
+          ],
           'include_dirs': [
             '../third_party/jsoncpp/overrides/include/',
             '../third_party/jsoncpp/source/include/',
             '../third_party/jsoncpp/source/src/lib_json/',
           ],
 
           # These source files are included directly, instead of adding target
           # dependencies, because the targets are not yet built for 64-bit on
           # Mac OS X - http://crbug.com/125116.
           #
@@ skipping 17 matching lines @@
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/PreferencePanes.framework',
               '$(SDKROOT)/System/Library/Frameworks/Security.framework',
             ],
           },
           'variables': {
             'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_ID@")',
-            'bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_NAME@")',
-            # The XML new-line entity splits the label into two lines, which
-            # is the maximum number of lines allowed by the System Preferences
-            # applet.
-            # TODO(lambroslambrou): When these strings are localized, use "\n"
-            # instead of "&#x0a;" for linebreaks.
-            'pref_pane_icon_label': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_ICON_LABEL@")',
           },
           'xcode_settings': {
             'ARCHS': ['i386', 'x86_64'],
             'GCC_ENABLE_OBJC_GC': 'supported',
             'INFOPLIST_FILE': 'host/mac/me2me_preference_pane-Info.plist',
             'INFOPLIST_PREPROCESS': 'YES',
-            'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_NAME="<(bundle_name)" BUNDLE_ID="<(bundle_id)" COPYRIGHT_INFO="<(copyright_info)" PREF_PANE_ICON_LABEL="<(pref_pane_icon_label)"',
+            'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(bundle_id)"',
           },
           'mac_bundle_resources': [
             'host/mac/me2me_preference_pane.xib',
             'host/mac/me2me_preference_pane_confirm_pin.xib',
             'host/mac/me2me_preference_pane_disable.xib',
             'host/mac/me2me_preference_pane-Info.plist',
             'resources/chromoting128.png',
+
+            # Localized strings for 'Info.plist'
+            '<!@pymod_do_main(remoting_localize --locale_output '
+                '"<(SHARED_INTERMEDIATE_DIR)/remoting/preference_pane_resources/@{json_suffix}.lproj/InfoPlist.strings" '
+                '--print_only <(remoting_locales))',
           ],
           'mac_bundle_resources!': [
             'host/mac/me2me_preference_pane-Info.plist',
           ],
           'conditions': [
             ['mac_breakpad==1', {
               'variables': {
                 # A real .dSYM is needed for dump_syms to operate on.
                 'mac_real_dsym': 1,
               },
@@ skipping 852 matching lines @@
           'webapp/appsv2.patch',
         ],
         'remoting_webapp_apps_v2_js_files': [
           'webapp/background.js',
         ],
       },
       'dependencies': [
         'remoting_resources',
         'remoting_host_plugin',
       ],
-      'sources': [
-        'webapp/build-webapp.py',
-        '<(remoting_version_path)',
-        '<(chrome_version_path)',
-        '<@(remoting_webapp_apps_v2_js_files)',
-        '<@(remoting_webapp_files)',
-        '<@(remoting_webapp_js_files)',
+      'locale_files': [
         '<@(remoting_webapp_locale_files)',
-        '<@(remoting_webapp_patch_files)',
       ],
       'conditions': [
         ['enable_remoting_host==1', {
+          'locale_files': [
+            '<@(remoting_locale_files)',
+          ],
           'variables': {
               'plugin_path': '<(PRODUCT_DIR)/<(host_plugin_prefix)remoting_host_plugin.<(host_plugin_extension)',
           },
         }, {
           'variables': {
               'plugin_path': '',
           },
           'dependencies!': [
             'remoting_host_plugin',
           ],
         }],
       ],
       'actions': [
         {
           'action_name': 'Build Remoting WebApp',
           'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp',
           'zip_path': '<(PRODUCT_DIR)/remoting-webapp.zip',
           'inputs': [
             'webapp/build-webapp.py',
             '<(chrome_version_path)',
             '<(remoting_version_path)',
             '<@(remoting_webapp_files)',
             '<@(remoting_webapp_js_files)',
-            '<@(remoting_webapp_locale_files)',
+            '<@(_locale_files)',
           ],
           'conditions': [
             ['enable_remoting_host==1', {
               'inputs': [
                 '<(plugin_path)',
               ],
             }],
           ],
           'outputs': [
             '<(_output_dir)',
             '<(_zip_path)',
           ],
           'action': [
             'python', 'webapp/build-webapp.py',
             '<(buildtype)',
             '<(version_full)',
             '<(host_plugin_mime_type)',
             '<(_output_dir)',
             '<(_zip_path)',
             '<(plugin_path)',
             '<@(remoting_webapp_files)',
             '<@(remoting_webapp_js_files)',
             '--locales',
-            '<@(remoting_webapp_locale_files)',
+            '<@(_locale_files)',
           ],
-          'msvs_cygwin_shell': 1,
+          'msvs_cygwin_shell': 0,
         },
       ],
       'target_conditions': [
         # We cannot currently build the appsv2 version of WebApp on Windows as
         # there isn't a version of the "patch" tool available on windows. We
         # should remove this condition when we remove the reliance on the 'patch'.
 
         # We define this in a 'target_conditions' section because 'plugin_path'
         # is defined in a 'conditions' section so its value is not available
         # when gyp processes the 'actions' in a 'conditions" section.
@@ skipping 33 matching lines @@
                 '<(_zip_path)',
                 '<(plugin_path)',
                 '<@(remoting_webapp_apps_v2_js_files)',
                 '<@(remoting_webapp_files)',
                 '<@(remoting_webapp_js_files)',
                 '--locales',
                 '<@(remoting_webapp_locale_files)',
                 '--patches',
                 '<@(remoting_webapp_patch_files)',
               ],
-              'msvs_cygwin_shell': 1,
+              'msvs_cygwin_shell': 0,
             },
           ],
         }],
       ],
     }, # end of target 'remoting_webapp'
 
     {
       'target_name': 'remoting_resources',
       'type': 'none',
       'variables': {
         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)',
         'grit_resource_ids': 'resources/resource_ids',
         'sources': [
           'base/resources_unittest.cc',
-          'host/plugin/host_script_object.cc',
+          'host/continue_window_mac.mm',
+          'host/disconnect_window_mac.mm',
+          'host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2',
+          'host/mac/me2me_preference_pane-InfoPlist.strings.jinja2',
+          'host/plugin/host_plugin-InfoPlist.strings.jinja2',
           'host/win/core.rc.jinja2',
           'host/win/host_messages.mc.jinja2',
           'host/win/version.rc.jinja2',
           'webapp/butter_bar.js',
           'webapp/client_screen.js',
           'webapp/error.js',
           'webapp/host_list.js',
+          'webapp/host_setup_dialog.js',
           'webapp/host_table_entry.js',
-          'webapp/host_setup_dialog.js',
           'webapp/main.html',
           'webapp/manifest.json',
           'webapp/paired_client_manager.js',
           'webapp/remoting.js',
         ],
       },
       'actions': [
         {
           'action_name': 'verify_resources',
           'inputs': [
             'resources/remoting_strings.grd',
-            'resources/common_resources.grd',
             'tools/verify_resources.py',
             '<@(sources)'
           ],
           'outputs': [
             '<(PRODUCT_DIR)/remoting_resources_verified.stamp',
           ],
           'action': [
             'python',
             'tools/verify_resources.py',
             '-t', '<(PRODUCT_DIR)/remoting_resources_verified.stamp',
             '-r', 'resources/remoting_strings.grd',
-            '-r', 'resources/common_resources.grd',
             '<@(sources)',
          ],
         },
         {
           'action_name': 'remoting_strings',
           'variables': {
             'grit_grd_file': 'resources/remoting_strings.grd',
           },
           'includes': [ '../build/grit_action.gypi' ],
         },
         {
-          'action_name': 'common_resources',
+          'action_name': 'copy_locales',
           'variables': {
-            'grit_grd_file': 'resources/common_resources.grd',
+            'copy_output_dir%': '<(PRODUCT_DIR)',
           },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-      ],
-      'copies': [
-        # Copy results to the product directory.
-        {
-          'destination': '<(PRODUCT_DIR)/remoting_locales',
-          'files': [
-            # Build the list of .pak files generated from remoting_strings.grd.
-            '<!@pymod_do_main(remoting_localize --locale_output '
-                '"<(grit_out_dir)/remoting/resources/${pak_suffix}.pak" '
-                '--print_only <(remoting_locales))',
+          'inputs': [
+            'tools/build/remoting_copy_locales.py',
+            '<!@pymod_do_main(remoting_copy_locales -i -p <(OS) -g <(grit_out_dir) <(remoting_locales))'
           ],
-        },
-        {
-          'destination': '<(PRODUCT_DIR)',
-          'files': [
-            '<(grit_out_dir)/remoting/resources/chrome_remote_desktop.pak',
-          ]
-        },
+          'outputs': [
+            '<!@pymod_do_main(remoting_copy_locales -o -p <(OS) -x <(copy_output_dir) <(remoting_locales))'
+          ],
+          'action': [
+            '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',
@@ skipping 33 matching lines @@
         'base/capabilities.cc',
         'base/capabilities.h',
         'base/compound_buffer.cc',
         'base/compound_buffer.h',
         'base/constants.cc',
         'base/constants.h',
         'base/plugin_thread_task_runner.cc',
         'base/plugin_thread_task_runner.h',
         'base/rate_counter.cc',
         'base/rate_counter.h',
-        'base/resources.cc',
         'base/resources.h',
+        'base/resources_linux.cc',
+        'base/resources_mac.mm',
+        'base/resources_win.cc',
         'base/rsa_key_pair.cc',
         'base/rsa_key_pair.h',
         'base/running_average.cc',
         'base/running_average.h',
         'base/socket_reader.cc',
         'base/socket_reader.h',
         'base/typed_buffer.h',
         'base/url_request_context.cc',
         'base/url_request_context.h',
         'base/util.cc',
@@ skipping 389 matching lines @@
           'include_dirs': [
             '../breakpad/src',
           ],
           'link_settings': {
             'libraries': [
               '-lrpcrt4.lib',
               '-lwtsapi32.lib',
             ],
           },
         }],
+        ['OS=="mac"', {
+          'mac_bundle': 1,
+          'xcode_settings': {
+            'INFOPLIST_FILE': 'unittests-Info.plist',
+            'INFOPLIST_PREPROCESS': 'YES',
+          },
+          'mac_bundle_resources': [
+            'unittests-Info.plist',
+            '<!@pymod_do_main(remoting_copy_locales -o -p <(OS) -x <(PRODUCT_DIR) <(remoting_locales))',
+          ],
+          'mac_bundle_resources!': [
+            'unittests-Info.plist',
+          ],
+        }],  # OS=="mac"
         ['OS=="mac" or (OS=="linux" and chromeos==0)', {
           # Javascript unittests are disabled on CrOS because they cause
           # valgrind and test errors.
           #
           # Javascript unittests are disabled on Windows because they add a
           # dependency on 'common_constants' which (only on Windows) requires
           # additional dependencies:
           #   '../content/content.gyp:content_common',
           #   'installer_util',
           # These targets are defined in .gypi files that would need to be
@@ skipping 46 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],  # end of 'toolkit_uses_gtk == 1'
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }