diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-21 17:10:43 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-21 17:10:43 +0000 |
| commit | d60734768b6044451278ea61045d4843694d9562 (patch) | |
| tree | 1fe460743db113859c5cd7a08ca4533b90c14a21 /apps/shell | |
| parent | 11ef91967445f891858da41836b3d187b4d6dbbf (diff) | |
| download | chromium_src-d60734768b6044451278ea61045d4843694d9562.zip chromium_src-d60734768b6044451278ea61045d4843694d9562.tar.gz chromium_src-d60734768b6044451278ea61045d4843694d9562.tar.bz2 | |
Revert 271737 "Revert 271721 "VS2013 Update 2""
https://src.chromium.org/viewvc/chrome?view=rev&revision=271919 fixes the
compiler crash, http://src.chromium.org/viewvc/chrome?view=rev&revision=271780
fixes the bug in landmines that didn't allow the initial land/revert to
go smoothly.
Should be A-OK this time.
> Revert 271721 "VS2013 Update 2"
>
> static_library build ICEing on some builders on mini_installer.
>
> > VS2013 Update 2
> >
> > As discussed in the linked bug, the toolchain2013.py script in
> > depot_tools is no longer workable (because the update for Update 2 is
> > supplied as a .msp that must be applied against a system-installed
> > VS2013).
> >
> > As such, the Express hash here is not updated.
> >
> > The hash zip referenced here was built as follows:
> > - Install VS2013 Update 2 on a clean VM
> > - Copy DIA SDK\, VC\
> > - Copy DLLs from VC\redist to sys32\ and sys64\
> > - Copy win8sdk unchanged from previous .zip.
> > - Delete various unused arm\ subdirectories
> > - Delete the IDE-only Snippets, etc. subdirectories in VC\
> > - Patch VC\include\xtree to disable warning 4702 per request in
> > http://crbug.com/346399 .
> >
> > A followup change will be to write a script that does these steps
> > semi-automatically, hopefully for Express too, though there is the
> > added complication of the WDK/ATL/MFC hacking required there. In
> > particular, this script will not be useful for a dev to actually run
> > as part of runhooks, but will be a bit useful for deployment/
> > documentation of the above process.
> >
> > In the interim there are no extremely-pressing reasons for Express
> > users to update to Update2 that I'm aware of, so they get non-Update2
> > for now.
> >
> > R=iannucci@chromium.org
> > BUG=372451,346399,371847,339215,350639
> >
> > Review URL: https://codereview.chromium.org/284663003
>
> TBR=scottmg@chromium.org
>
> Review URL: https://codereview.chromium.org/297753002
TBR=scottmg@chromium.org
Review URL: https://codereview.chromium.org/295093004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/shell')
| -rw-r--r-- | apps/shell/app_shell.gyp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/apps/shell/app_shell.gyp b/apps/shell/app_shell.gyp index c2f3c10..989f768 100644 --- a/apps/shell/app_shell.gyp +++ b/apps/shell/app_shell.gyp @@ -175,7 +175,6 @@ 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS }, }, - 'msvs_large_pdb': 1, 'dependencies': [ '<(DEPTH)/sandbox/sandbox.gyp:sandbox', ], @@ -197,7 +196,6 @@ 'defines': [ 'HAS_OUT_OF_PROC_TEST_RUNNER', ], - 'msvs_large_pdb': 1, 'sources': [ # TODO(yoz): Refactor once we have a second test target. 'browser/shell_browsertest.cc', |