diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/app-Info.plist | 4 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 29 |
2 files changed, 23 insertions, 10 deletions
diff --git a/chrome/app/app-Info.plist b/chrome/app/app-Info.plist index 872244f..8c18310 100644 --- a/chrome/app/app-Info.plist +++ b/chrome/app/app-Info.plist @@ -119,11 +119,11 @@ <key>CFBundleIconFile</key> <string>app.icns</string> <key>CFBundleIdentifier</key> - <string>BUNDLE_ID</string> + <string>${CHROMIUM_BUNDLE_ID}</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> - <string>BUNDLE_NAME</string> + <string>${EXECUTABLE_NAME}</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 62bb9ac..43d4676 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1936,14 +1936,10 @@ }], ], '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': [ @@ -1958,6 +1954,23 @@ }], ], }], + ['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', |