summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authorthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-11 14:56:37 +0000
committerthomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-11 14:56:37 +0000
commit4e086463cb7de8e6c1538e7282d2ed260ae8099f (patch)
treed63cf24bcd0e4ecb8296c41a2c40299b0fd89826 /chrome/chrome.gyp
parentd4af56a5025a40a8f229b1a6eff43f6cd9a7aba8 (diff)
downloadchromium_src-4e086463cb7de8e6c1538e7282d2ed260ae8099f.zip
chromium_src-4e086463cb7de8e6c1538e7282d2ed260ae8099f.tar.gz
chromium_src-4e086463cb7de8e6c1538e7282d2ed260ae8099f.tar.bz2
Set the CFBundleName during the info.plist processing instead of fixing it up in the packaging step.
Review URL: http://codereview.chromium.org/113196 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15752 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp15
1 files changed, 10 insertions, 5 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 564db3b..7d8d854 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1903,9 +1903,9 @@
'conditions': [
['branding=="Chrome"', {
'mac_bundle_resources': ['app/theme/google_chrome/app.icns'],
- # "bundle_id" is the name of the variable used to replace
- # BUNDLE_ID in Info.plist.
- 'variables': {'bundle_id': 'com.google.Chrome'},
+ 'variables': {
+ 'bundle_id': 'com.google.Chrome',
+ },
# Only include breakpad in official builds.
'dependencies': [
'../breakpad/breakpad.gyp:breakpad',
@@ -1918,7 +1918,9 @@
]
}, { # else: branding!="Chrome"
'mac_bundle_resources': ['app/theme/chromium/app.icns'],
- 'variables': {'bundle_id': 'org.chromium.Chromium'},
+ 'variables': {
+ 'bundle_id': 'org.chromium.Chromium',
+ },
}],
],
'xcode_settings': {
@@ -1926,7 +1928,10 @@
# to be replaced by a properly branded bundle ID in Xcode with
# these settings.
'INFOPLIST_PREPROCESS': 'YES',
- 'INFOPLIST_PREPROCESSOR_DEFINITIONS': ['BUNDLE_ID="<(bundle_id)"'],
+ 'INFOPLIST_PREPROCESSOR_DEFINITIONS': [
+ 'BUNDLE_ID="<(bundle_id)"',
+ 'BUNDLE_NAME="<(branding)"'
+ ],
},
}, { # else: OS != "mac"
'conditions': [