diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 01:40:17 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 01:40:17 +0000 |
| commit | 14b37f70d87fc42d6db3dbfbe160d734b74b505b (patch) | |
| tree | 6ba42fb71cdb2b86815a473c7bb161d369ad413c | |
| parent | 4860fb2f8603c38218240669f674f3807135147b (diff) | |
| download | chromium_src-14b37f70d87fc42d6db3dbfbe160d734b74b505b.zip chromium_src-14b37f70d87fc42d6db3dbfbe160d734b74b505b.tar.gz chromium_src-14b37f70d87fc42d6db3dbfbe160d734b74b505b.tar.bz2 | |
Correcting dependency problem that causes setup.exe to get built before chrome frame - this results in chrome frame not getting registered when setup is run.
BUG=http://crbug.com/25074
TEST=When Chrome Frame is built, the resulting mini_installer registers Chrome Frame.
Review URL: http://codereview.chromium.org/298001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29384 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/installer/installer.gyp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp index 1bc1148..b639751 100644 --- a/chrome/installer/installer.gyp +++ b/chrome/installer/installer.gyp @@ -333,14 +333,19 @@ ], }, ], - # TODO(mark): <(branding_dir) 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': [ + ['chrome_frame_define==1', { + 'dependencies': [ + '../../chrome_frame/chrome_frame.gyp:npchrome_tab', + ], + }], + # TODO(mark): <(branding_dir) 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. [ 'branding == "Chrome"', { 'variables': { 'branding_dir': '../app/theme/google_chrome', |