diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-19 21:15:06 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-19 21:15:06 +0000 |
| commit | fd1d6998e6a96569e478c87220f6825a3e47851c (patch) | |
| tree | 0f2e2d2e174c20c4eb7366b2d678f58d8aaa633c /chrome/chrome.gyp | |
| parent | 01bfd02b5e75ad54e90c5379da3a84c714c79bf6 (diff) | |
| download | chromium_src-fd1d6998e6a96569e478c87220f6825a3e47851c.zip chromium_src-fd1d6998e6a96569e478c87220f6825a3e47851c.tar.gz chromium_src-fd1d6998e6a96569e478c87220f6825a3e47851c.tar.bz2 | |
Adding a secondary mini_installer target for Chrome Frame. This will remove the need to have different build scripts to build either Chrome or Chrome Frame.
Also remove the now-unneeded gyp variables 'chrome_frame_define' and 'google_update_appid'.
BUG=Both Chrome and Chrome Frame products should be buildable from a single solution file - we shouldn't need to run GYP with different settings to get a CF solution.
TEST=none
Review URL: http://codereview.chromium.org/542078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36546 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rwxr-xr-x | chrome/chrome.gyp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 286c16e..de2a386 100755 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1233,6 +1233,7 @@ 'installer/installer.gyp:*', '../app/app.gyp:*', '../base/base.gyp:*', + '../chrome_frame/chrome_frame.gyp:*', '../ipc/ipc.gyp:*', '../media/media.gyp:*', '../net/net.gyp:*', @@ -1275,11 +1276,6 @@ '../base/allocator/allocator.gyp:*', ], }], - ['chrome_frame_define==1', { - 'dependencies': [ - '../chrome_frame/chrome_frame.gyp:*', - ], - }], ], }, { |