diff options
Diffstat (limited to 'chrome/installer/installer.gyp')
| -rw-r--r-- | chrome/installer/installer.gyp | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp index 1234a82..21e3a65 100644 --- a/chrome/installer/installer.gyp +++ b/chrome/installer/installer.gyp @@ -396,6 +396,24 @@ ], }, ], + # TODO(mark): <(BRANDING) should be defined by the + # global condition block at the bottom of the file, but + # this doesn't work due to the following issue: + # + # http://code.google.com/p/gyp/issues/detail?id=22 + # + # Remove this block once the above issue is fixed. + 'conditions': [ + [ 'branding == "Chrome"', { + 'variables': { + 'BRANDING': '../../chrome/app/theme/google_chrome/BRANDING', + }, + }, { # else branding!="Chrome" + 'variables': { + 'BRANDING': '../../chrome/app/theme/chromium/BRANDING', + }, + }], + ], }, { 'target_name': 'mini_installer_test', @@ -522,6 +540,24 @@ ], }, ], + # TODO(mark): <(BRANDING) should be defined by the + # global condition block at the bottom of the file, but + # this doesn't work due to the following issue: + # + # http://code.google.com/p/gyp/issues/detail?id=22 + # + # Remove this block once the above issue is fixed. + 'conditions': [ + [ 'branding == "Chrome"', { + 'variables': { + 'BRANDING': '../../chrome/app/theme/google_chrome/BRANDING', + }, + }, { # else branding!="Chrome" + 'variables': { + 'BRANDING': '../../chrome/app/theme/chromium/BRANDING', + }, + }], + ], }, ], }], |