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_exe.gypi | |
| 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_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index d57770b..7d923b7 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -130,13 +130,6 @@ 'chrome_exe_target': 1, }, 'conditions': [ - ['chrome_frame_define==1 and OS=="win"', { - # TODO(gregoryd): This could be shared with the 64-bit target, but - # it does not work due to a gyp issue. - 'dependencies': [ - '../chrome_frame/chrome_frame.gyp:npchrome_frame', - ], - }], ['OS=="linux" or OS=="freebsd"', { 'actions': [ { @@ -509,6 +502,7 @@ '../breakpad/breakpad.gyp:breakpad_handler_win64', '../breakpad/breakpad.gyp:breakpad_sender_win64', '../base/base.gyp:base_nacl_win64', + '../chrome_frame/chrome_frame.gyp:npchrome_frame', # TODO(gregoryd): build sandbox for 64 bit # '../sandbox/sandbox.gyp:sandbox', ], @@ -524,15 +518,6 @@ 'ProgramDatabaseFile': '$(OutDir)\\nacl_exe.pdb', }, }, - 'conditions': [ - ['chrome_frame_define==1 and OS=="win"', { - # TODO(gregoryd): This could be shared with the 32-bit target, but - # it does not work due to a gyp issue. - 'dependencies': [ - '../chrome_frame/chrome_frame.gyp:npchrome_frame', - ], - }], - ], 'configurations': { 'Common_Base': { 'msvs_target_platform': 'x64', |