| Index: chrome/chrome_exe.gypi
|
| diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
|
| index 547d7bd229b861862ec08ac611d0a4100f2d4977..d33689408d518540560f5a72e5ed11edec9eb2ec 100644
|
| --- a/chrome/chrome_exe.gypi
|
| +++ b/chrome/chrome_exe.gypi
|
| @@ -420,18 +420,14 @@
|
| }],
|
| ['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".
|
| - # NOTE: chrome/app/theme/chromium/BRANDING and
|
| - # chrome/app/theme/google_chrome/BRANDING have the short names,
|
| - # etc.; should we try to extract from there instead?
|
| - 'product_name': 'chrome'
|
| - }],
|
| + # TODO: add a:
|
| + # 'product_name': 'chromium'
|
| + # whenever we convert the rest of the infrastructure
|
| + # (buildbots etc.) to understand the branding gyp define.
|
| + # NOTE: chrome/app/theme/chromium/BRANDING and
|
| + # chrome/app/theme/google_chrome/BRANDING have the short name
|
| + # "chrome" etc.; should we try to extract from there instead?
|
| +
|
| # On Mac, this is done in chrome_dll.gypi.
|
| ['internal_pdf', {
|
| 'dependencies': [
|
|
|