Make me2me_host a Mac bundle

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 302 matching lines @@
               },
             }],
           ],  # conditions
           'actions': [
             {
               'action_name': 'Zip installer files for signing',
               'temp_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting-me2me-host',
               'zip_path': '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
               'generated_files': [
                 '<(PRODUCT_DIR)/remoting_host_prefpane.prefPane',
-                '<(PRODUCT_DIR)/remoting_me2me_host',
+                '<(PRODUCT_DIR)/remoting_me2me_host.app',
                 '<(PRODUCT_DIR)/remoting_host_uninstaller.app',
               ],
               'generated_files_dst': [
                 'PreferencePanes/org.chromium.chromoting.prefPane',
-                'PrivilegedHelperTools/org.chromium.chromoting.me2me_host',
+                'PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app',
                 'Applications/<(host_uninstaller_name).app',
               ],
               'source_files': [
                 '<@(remoting_host_installer_mac_files)',
               ],
               'defs': [
                 'VERSION=<(version_full)',
                 'VERSION_SHORT=<(version_short)',
                 'VERSION_MAJOR=<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@")',
                 'VERSION_MINOR=<!(python <(version_py_path) -f <(version_path) -t "@MINOR@")',
@@ skipping 1002 matching lines @@
         'host/sighup_listener_mac.h',
         'host/remoting_me2me_host.cc',
       ],
       'conditions': [
         ['os_posix==1', {
           'sources': [
             'host/host_event_logger_posix.cc',
           ],
         }],
         ['OS=="mac"', {
-          'sources': [
-            'host/remoting_me2me_host-Info.plist',
-          ],
+          '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',
               },
             }],
           ],
           'xcode_settings': {
-            'OTHER_LDFLAGS': [
-              '-Wl,-sectcreate,__TEXT,__info_plist,<(INTERMEDIATE_DIR)/remoting_me2me_host-Info.plist'
-            ],
+            '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)"',
           },
-          'rules': [
-            {
-              'rule_name': 'brand_mac',
-              'extension': 'plist',
-              'inputs': [ ],
-              'outputs': [
-                '<(INTERMEDIATE_DIR)/remoting_me2me_host-Info.plist',
-              ],
-              'action': [
-                'python', '<(version_py_path)',
-                '-i', 'host/remoting_me2me_host-Info.plist',
-                '-o', '<(INTERMEDIATE_DIR)/remoting_me2me_host-Info.plist',
-                '-e', 'VERSION_FULL="<(version_full)"',
-                '-e', 'VERSION_SHORT="<(version_short)"',
-                '-e', 'BUNDLE_ID="<(host_bundle_id)"',
-              ],
-              'process_outputs_as_sources': 1,
-              'message': 'Branding and versioning remoting_me2me_host.',
-            },
+          'mac_bundle_resources': [
+            'host/remoting_me2me_host-Info.plist',
+          ],
+          '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/remoting_host_messages.mc',
@@ skipping 360 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }