- Set the bundle name based on the executable name (since they both are the b...

chrome/chrome.gyp

 # Copyright (c) 2009 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,
   },
   'includes': [
     '../build/common.gypi',
@@ skipping 1906 matching lines @@
                 },
               ]
             }, {  # else: branding!="Chrome"
               'mac_bundle_resources': ['app/theme/chromium/app.icns'],
               'variables': {
                 'bundle_id': 'org.chromium.Chromium',
               },
             }],
           ],
           'xcode_settings': {
-            # chrome/app/app-Info.plist has a CFBundleIdentifier of BUNDLE_ID,
-            # to be replaced by a properly branded bundle ID in Xcode with
-            # these settings.
-            'INFOPLIST_PREPROCESS': 'YES',
-            'INFOPLIST_PREPROCESSOR_DEFINITIONS': [
-              'BUNDLE_ID="<(bundle_id)"',
-              'BUNDLE_NAME="<(branding)"'
-            ],
+            # chrome/app/app-Info.plist has a CFBundleIdentifier of
+            # CHROMIUM_BUNDLE_ID to be replaced by a branded bundle ID in Xcode
+            # with this settings.
+            'CHROMIUM_BUNDLE_ID': '<(bundle_id)',
           },
         }, { # else: OS != "mac"
           'conditions': [
             ['branding=="Chrome"', {
               'product_name': 'chrome'
             }, {  # else: Branding!="Chrome"
               # TODO:  change to:
               #   'product_name': 'chromium'
               # whenever we convert the rest of the infrastructure
               # (buildbots etc.) to use "gyp -Dbranding=Chrome".
               'product_name': 'chrome'
             }],
           ],
         }],
+        ['OS=="mac"', {
+          # Mac addes an action to modify the Info.plist to meet our needs
+          # (see the script for why this is done).
+          'actions': [
+            {
+              'action_name': 'tweak_app_infoplist',
+              # We don't list any inputs or outputs because we always want
+              # the script to run.  Why?  Because it does thinks like record
+              # the svn revision into the info.plist, so there is no file to
+              # depend on that will change when ever that changes.
+              'inputs': [],
+              'outputs': [],
+              'action': ['<(DEPTH)/build/mac/tweak_app_infoplist',
+                         '<(branding)'],
+            },
+          ],
+        }],
         ['OS=="win"', {
           'include_dirs': [
             'third_party/wtl/include',
           ],
           'dependencies': [
             'views',
             '../build/temp_gyp/breakpad.gyp:breakpad_handler',
             '../build/temp_gyp/breakpad.gyp:breakpad_sender',
             '../sandbox/sandbox.gyp:sandbox',
             'worker',
@@ skipping 1444 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }