Mac: Generate App Mode Loader bundle + cleanup

chrome/chrome.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': {
       'version_py_path': 'tools/build/version.py',
       'version_path': 'VERSION',
@@ skipping 68 matching lines @@
           'NACL_WINDOWS=0',
           'NACL_LINUX=0',
           'NACL_OSX=1',
         ],
         'platform_locale_settings_grd':
             'app/resources/locale_settings_mac.grd',
         'conditions': [
           ['branding=="Chrome"', {
             'mac_bundle_id': 'com.google.Chrome',
             'mac_creator': 'rimZ',
+            'app_mode_app_bundle_id': 'com.google.Chrome.app.@APP_MODE_SHORTCUT_ID@',
             # The policy .grd file also needs the bundle id.
             'grit_defines': ['-D', 'mac_bundle_id=com.google.Chrome'],
           }, {  # else: branding!="Chrome"
             'mac_bundle_id': 'org.chromium.Chromium',
             'mac_creator': 'Cr24',
+            'app_mode_app_bundle_id': 'com.google.Chromium.app.@APP_MODE_SHORTCUT_ID@',
             # The policy .grd file also needs the bundle id.
             'grit_defines': ['-D', 'mac_bundle_id=org.chromium.Chromium'],
           }],  # branding
         ],  # conditions
       }],  # OS=="mac"
       # TODO(mcgrathr): This duplicates native_client/build/common.gypi;
       # we should figure out a way to unify the settings.
       ['target_arch=="ia32"', {
         'nacl_defines': [
           'NACL_TARGET_SUBARCH=32',
@@ skipping 674 matching lines @@
                 '-change',
                 '@executable_path/../Versions/<(version_full)/<(mac_product_name) Framework.framework/<(mac_product_name) Framework',
                 '@executable_path/../../../<(mac_product_name) Framework.framework/<(mac_product_name) Framework',
                 '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'
               ],
             },
             {
               # Modify the Info.plist as needed.  The script explains why this
               # is needed.  This is also done in the chrome and chrome_dll
               # targets.  In this case, --breakpad=0, -k0, and -s0 are used
-              # because Breakpad, Keystone, and Subersion keys are never
+              # because Breakpad, Keystone, and Subversion keys are never
               # placed into the helper.
               'postbuild_name': 'Tweak Info.plist',
               'action': ['<(tweak_info_plist_path)',
                          '--breakpad=0',
                          '-k0',
                          '-s0',
                          '<(branding)',
                          '<(mac_bundle_id)'],
             },
             {
@@ skipping 39 matching lines @@
             'common/mac/app_mode_chrome_locator.h',
             'common/mac/app_mode_chrome_locator.mm',
             'common/mac/app_mode_common.h',
             'common/mac/app_mode_common.mm',
           ],
           'include_dirs': [
             '..',
           ],
         },  # target app_mode_app_support
         {
-          # This produces the app mode loader, but not as a bundle. Chromium
-          # itself is responsible for producing bundles.
+          # This produces the template for app mode loader bundles. It's a
+          # template in the sense that parts of it need to be "filled in" by
+          # Chrome before it can be executed.
           'target_name': 'app_mode_app',
           'type': 'executable',
+          'mac_bundle' : 1,
           'variables': { 'enable_wexit_time_destructors': 1, },
-          'product_name': '<(mac_product_name) App Mode Loader',
+          'product_name': 'app_mode_loader',
           'dependencies': [
             'app_mode_app_support',
+            'infoplist_strings_tool',
           ],
           'sources': [
             'app/app_mode_loader_mac.mm',
+            'app/app_mode-Info.plist',
           ],
           'include_dirs': [
             '..',
           ],
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
             ],
           },
+          'mac_bundle_resources!': [
+            'app/app_mode-Info.plist',
+          ],
+          'mac_bundle_resources/': [
+            ['exclude', '.*'],
+          ],
+          'xcode_settings': {
+            'INFOPLIST_FILE': 'app/app_mode-Info.plist',
+            'APP_MODE_APP_BUNDLE_ID': '<(app_mode_app_bundle_id)',
+          },
+          'postbuilds' : [
+            {
+              # Modify the Info.plist as needed.  The script explains why this
+              # is needed.  This is also done in the chrome and chrome_dll
+              # targets.  In this case, --breakpad=0, -k0, and -s0 are used
+              # because Breakpad, Keystone, and Subversion keys are never
+              # placed into the helper.
+              'postbuild_name': 'Tweak Info.plist',
+              'action': ['<(tweak_info_plist_path)',
+                         '--breakpad=0',
+                         '-k0',
+                         '-s0',
+                         '<(branding)',
+                         '<(mac_bundle_id)'],
+            },
+          ],
         },  # target app_mode_app
         {
           # Convenience target to build a disk image.
           'target_name': 'build_app_dmg',
           # Don't place this in the 'all' list; most won't want it.
           # In GYP, booleans are 0/1, not True/False.
           'suppress_wildcard': 1,
           'type': 'none',
           'dependencies': [
             'chrome',
@@ skipping 443 matching lines @@
           'sources': [
             'browser/safe_browsing/signature_util.h',
             'browser/safe_browsing/signature_util_win.cc',
             'tools/safe_browsing/sb_sigutil.cc',
           ],
         },
       ]},  # 'targets'
     ],  # OS=="win"
   ],  # 'conditions'
 }