diff options
| author | brucedawson <brucedawson@chromium.org> | 2016-03-11 11:55:25 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-11 19:56:33 +0000 |
| commit | 2b33e7eee5db5f956426dbf664f68bff3fe7daee (patch) | |
| tree | f43028ab54c619f1644f9e3584bed621465c348c /build/common.gypi | |
| parent | c9d2206c62f65e29b141e08df2b2dcb88f54162f (diff) | |
| download | chromium_src-2b33e7eee5db5f956426dbf664f68bff3fe7daee.zip chromium_src-2b33e7eee5db5f956426dbf664f68bff3fe7daee.tar.gz chromium_src-2b33e7eee5db5f956426dbf664f68bff3fe7daee.tar.bz2 | |
Reland of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1778343002/ )
Reason for revert:
Preparing a revert in order to reland VS 2015. The CL is not reading for committing yet.
Original issue's description:
> Revert of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1740583002/ )
>
> Reason for revert:
> Broke isolate tests on Win8 GN (dbg) and Win x64 GN (dbg).
>
> Original issue's description:
> > Reland of Change default Windows compiler to VS 2015
> >
> > The change to get_landmines.py is there because modifying this file
> > affects analyze behavior so that all tests run. Changing the printed
> > message is purely a side effect.
> >
> > This change also removes some redundant INCLUDE paths. These are
> > unnecessary when building with VS 2015 (because it defaults to the
> > Windows 10 SDK) and actively harmful (they make the INCLUDE path
> > problematically long).
> >
> > This change was redone in order to fix merge conflicts and because after
> > a few weeks a fresh set of approvals seems reasonable.
> >
> > The original change was landed as crrev.com/1598493004
> >
> > BUG=440500, 584782
> >
> > Committed: https://crrev.com/d4dcbd342dd54f55383daf8bc44b2c9d97fe0d0b
> > Cr-Commit-Position: refs/heads/master@{#380382}
>
> TBR=scottmg@chromium.org,dpranke@chromium.org,brucedawson@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=440500, 584782
>
> Committed: https://crrev.com/cb3f85f80a2c146e0e4bf064f02bf68acb274ce5
> Cr-Commit-Position: refs/heads/master@{#380395}
TBR=scottmg@chromium.org,dpranke@chromium.org,vasilii@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=440500, 584782
Review URL: https://codereview.chromium.org/1783773004
Cr-Commit-Position: refs/heads/master@{#380711}
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/build/common.gypi b/build/common.gypi index 885e325..32daaf2 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -5634,11 +5634,13 @@ ], }], ], + # Add extra include directories here that need to be in front of the + # installed and packaged include directories. This may be needed in + # order to force a particular SDK version, such as to get VS 2013 to use + # the Windows 10 SDK. Beware of making the INCLUDE variable excessively + # long, and be sure to make corresponding changes to + # build\toolchain\win\setup_toolchain.py 'msvs_system_include_dirs': [ - '<(windows_sdk_path)/Include/10.0.10586.0/shared', - '<(windows_sdk_path)/Include/10.0.10586.0/um', - '<(windows_sdk_path)/Include/10.0.10586.0/winrt', - '$(VSInstallDir)/VC/atlmfc/include', ], 'msvs_cygwin_shell': 0, 'msvs_disabled_warnings': [ |