diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 20:08:00 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 20:08:00 +0000 |
| commit | 2c85245e96d548c0c647a765e15b808ef4a12fe9 (patch) | |
| tree | 33fa6d9732f05be211151ef40b4924beecbd3b11 | |
| parent | e0262c9d5341eee36dbe30b376fb7d68c5485228 (diff) | |
| download | chromium_src-2c85245e96d548c0c647a765e15b808ef4a12fe9.zip chromium_src-2c85245e96d548c0c647a765e15b808ef4a12fe9.tar.gz chromium_src-2c85245e96d548c0c647a765e15b808ef4a12fe9.tar.bz2 | |
Add duplicate 'conditions' blocks that define the '<(BRANDING)'
variable for the 'OS=="win"' targets that use it, to work around
an apparent problem in the gyp variable expansion.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/118010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17208 0039d316-1c4b-4281-b951-d872f2087c98
| -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', + }, + }], + ], }, ], }], |