summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-06 20:38:16 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-06 20:38:16 +0000
commit53939ea429d84e0a380b37ad15c9e4c0030caae3 (patch)
tree997baa4685daaf47445644dfbe8cc5063197c9c3 /chrome
parent5846da03b8e2673d6be22f317a4eba89db9a03ed (diff)
downloadchromium_src-53939ea429d84e0a380b37ad15c9e4c0030caae3.zip
chromium_src-53939ea429d84e0a380b37ad15c9e4c0030caae3.tar.gz
chromium_src-53939ea429d84e0a380b37ad15c9e4c0030caae3.tar.bz2
Add a product_name of 'chrome' on the non-Mac systems.
This adds a placeholder condition for building branded 'chrome.exe' vs. 'chromium.exe', which can be updated to build 'chromium.exe' by default whenever we update the infrastructure (buildbots, developer instructions, etc.) to use -Dbranding=Chrome. Review URL: http://codereview.chromium.org/40233 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome.gyp12
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index d36f093..da41a40 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1354,6 +1354,18 @@
'mac_bundle_resources': ['app/theme/chromium/app.icns'],
}],
],
+ }, { # 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!="win"', {
'variables': {