summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-20 21:46:48 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-20 21:46:48 +0000
commitce9ca28e14bc8e02678c02df977bae0a85fba040 (patch)
tree3a380c056f0a5a0cf52d45dd6772cfcce95b3be3 /chrome/installer
parent385347182b57be9e0d013179b45ff91c139cc177 (diff)
downloadchromium_src-ce9ca28e14bc8e02678c02df977bae0a85fba040.zip
chromium_src-ce9ca28e14bc8e02678c02df977bae0a85fba040.tar.gz
chromium_src-ce9ca28e14bc8e02678c02df977bae0a85fba040.tar.bz2
Relanding precompiled header support for VS 2008, now enabled for
Debug builds only as official builds were failing with out of memory errors. This is mostly a revert of http://crrev.com/101836 which was a revert of the original change, http://crrev.com/101474, except for a modification to build/win_precompile.gypi to only enable use of precompiled headers in the Debug configuration. BUG=none TEST=it builds Review URL: http://codereview.chromium.org/7977003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/mini_installer.gyp15
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 6c41bd3..18b39f82 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -175,6 +175,21 @@
{
'target_name': 'mini_installer',
'type': 'executable',
+ 'configurations': {
+ 'Debug': {
+ # Disable precompiled headers for this project, to avoid
+ # linker errors when building with VS 2008.
+ #
+ # Note that putting this in the 'target_defaults'
+ # section earlier in the file does not successfully
+ # override the 'target_defaults' brought in by the
+ # build/win_precompile.gypi file, so the overriding
+ # needs to be done here, directly in the mini_installer
+ # target.
+ 'msvs_precompiled_header': '',
+ 'msvs_precompiled_source': '',
+ },
+ },
'sources': [
'mini_installer/chrome.release',
'mini_installer/chrome_appid.cc',