From 37f95c0b02274e6feb8ba73653d6230ea2a92c8c Mon Sep 17 00:00:00 2001
From: "nsylvain@chromium.org"
<nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 27 Dec 2010 19:23:05 +0000
Subject: [PATCH] Don't build using GPO for the tests EXEs we build during our
official build.
BUG=none
Review URL: http://codereview.chromium.org/6034011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70195 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/chrome_tests.gypi | 44 +++++++++++++++++++++++++++++++++++
chrome_frame/chrome_frame.gyp | 11 +++++++++
2 files changed, 55 insertions(+)
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 23dde1c1a8e78..c945b0742a4bd 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -250,6 +250,17 @@
'test/automated_ui_tests/automated_ui_tests.h',
],
'conditions': [
+ ['OS=="win" and buildtype=="Official"', {
+ 'configurations': {
+ 'Release': {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'WholeProgramOptimization': 'false',
+ },
+ },
+ },
+ },
+ },],
['OS=="linux"', {
'dependencies': [
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
@@ -2405,6 +2416,17 @@
'test/startup/startup_test.cc',
],
'conditions': [
+ ['OS=="win" and buildtype=="Official"', {
+ 'configurations': {
+ 'Release': {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'WholeProgramOptimization': 'false',
+ },
+ },
+ },
+ },
+ },],
['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:gtk',
@@ -2481,6 +2503,17 @@
'test/reliability/run_all_unittests.cc',
],
'conditions': [
+ ['OS=="win" and buildtype=="Official"', {
+ 'configurations': {
+ 'Release': {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'WholeProgramOptimization': 'false',
+ },
+ },
+ },
+ },
+ },],
['OS=="win" and win_use_allocator_shim==1', {
'dependencies': [
'<(allocator_target)',
@@ -2521,6 +2554,17 @@
'test/page_cycler/page_cycler_test.cc',
],
'conditions': [
+ ['OS=="win" and buildtype=="Official"', {
+ 'configurations': {
+ 'Release': {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'WholeProgramOptimization': 'false',
+ },
+ },
+ },
+ },
+ },],
['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:gtk',
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 0eb7ea4d36327..87fb7aadaa348 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -222,6 +222,17 @@
}],
],
}],
+ ['OS=="win" and buildtype=="Official"', {
+ 'configurations': {
+ 'Release': {
+ 'msvs_settings': {
+ 'VCCLCompilerTool': {
+ 'WholeProgramOptimization': 'false',
+ },
+ },
+ },
+ },
+ },],
['OS=="win"', {
'link_settings': {
'libraries': [
--
GitLab