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_frame/chrome_frame.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_frame/chrome_frame.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 75d0d42..de04bbd 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -304,7 +304,6 @@ 'dependencies': [ '../base/base.gyp:test_support_base', '../chrome/chrome.gyp:browser', - '../chrome/chrome.gyp:chrome_dll_version', '../chrome/chrome.gyp:chrome_resources', '../chrome/chrome.gyp:debugger', '../chrome/chrome.gyp:renderer', @@ -343,11 +342,11 @@ 'conditions': [ ['OS=="win"', { 'dependencies': [ - '../chrome/chrome.gyp:automation', '../breakpad/breakpad.gyp:breakpad_handler', + '../chrome/chrome.gyp:automation', + '../chrome/chrome.gyp:chrome_dll_version', '../chrome/installer/installer.gyp:installer_util', '../google_update/google_update.gyp:google_update', - '../chrome/installer/installer.gyp:installer_util', ] }], ], |