diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 17:46:58 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-15 17:46:58 +0000 |
| commit | f1f362b4cb2e355b394260f6dd6ad26f42416f16 (patch) | |
| tree | bd41ed395ee2b44904dcae510a9c876515617eb2 /build | |
| parent | 350da7d715290c17c49cb6bb7a062be55e2b26da (diff) | |
| download | chromium_src-f1f362b4cb2e355b394260f6dd6ad26f42416f16.zip chromium_src-f1f362b4cb2e355b394260f6dd6ad26f42416f16.tar.gz chromium_src-f1f362b4cb2e355b394260f6dd6ad26f42416f16.tar.bz2 | |
Attempt to reapply crrev.com/137083.
Disabling precompiled headers for official builds with msvs2010
Selectively disabling precompiled headers for release builds with msvs2010
Precompiled headers seem to interact badly with auto-sharding using the
msvs_shard option.
Incudes speculative fix for KeyError in Linux gyp builds (see http://build.chromium.org/p/chromium.pyauto/builders/Linux%20%28deb%29/builds/33094/steps/update/logs/stdio for details) that removes line 140 from http://codereview.chromium.org/10392091/diff/6/build/common.gypi
BUG=127875
TEST=builds on trybots.
R=kerz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10332173
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/build/common.gypi b/build/common.gypi index 7361dff..c4c912b 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -52,6 +52,16 @@ # Allows us to *temporarily* disable certain things for # staging. Only set to 1 in a GYP_DEFINES. 'android_upstream_bringup%': 0, + + # Override buildtype to select the desired build flavor. + # Dev - everyday build for development/testing + # Official - release build (generally implies additional processing) + # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp + # conversion is done), some of the things which are now controlled by + # 'branding', such as symbol generation, will need to be refactored + # based on 'buildtype' (i.e. we don't care about saving symbols for + # non-Official # builds). + 'buildtype%': 'Dev', }, # Copy conditionally-set variables out one scope. 'chromeos%': '<(chromeos)', @@ -64,6 +74,10 @@ 'enable_touch_ui%': '<(enable_touch_ui)', 'enable_metro%': '<(enable_metro)', 'android_upstream_bringup%': '<(android_upstream_bringup)', + 'buildtype%': '<(buildtype)', + + # Use of precompiled headers on Windows. See comment below. + 'chromium_win_pch%': '0', # Compute the architecture that we're building on. 'conditions': [ @@ -126,6 +140,7 @@ 'enable_touch_ui%': '<(enable_touch_ui)', 'enable_metro%': '<(enable_metro)', 'android_upstream_bringup%': '<(android_upstream_bringup)', + 'chromium_win_pch%': '<(chromium_win_pch)', # We used to provide a variable for changing how libraries were built. # This variable remains until we can clean up all the users. @@ -137,15 +152,7 @@ # Override branding to select the desired branding flavor. 'branding%': 'Chromium', - # Override buildtype to select the desired build flavor. - # Dev - everyday build for development/testing - # Official - release build (generally implies additional processing) - # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp - # conversion is done), some of the things which are now controlled by - # 'branding', such as symbol generation, will need to be refactored based - # on 'buildtype' (i.e. we don't care about saving symbols for non-Official - # builds). - 'buildtype%': 'Dev', + 'buildtype%': '<(buildtype)', # Default architecture we're building for is the architecture we're # building on. @@ -444,7 +451,7 @@ }], # Turn precompiled headers on by default for VS 2010. - ['OS=="win" and MSVS_VERSION=="2010"', { + ['OS=="win" and MSVS_VERSION=="2010" and buildtype!="Official"', { 'chromium_win_pch%': 1 }], |