These changes allow more of Chromium to be built using Python 3.
The scripts still work with Python 2.
There are no intended behaviour changes.
Bug: 941669
Change-Id: I6897d00ce00ec6aa5d7ca216b9f302e725a21897
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1527522
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Raul Tambre <raul@tambre.ee>
Cr-Original-Commit-Position: refs/heads/master@{#642401}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 79fbf3cf437660defd0eee56685c7a785812591d
The changes are to allow build files to be generated using Python 3 on Windows.
The scripts still work with Python 2.
There are no intended behaviour changes.
Bug: 941669
Change-Id: I52c912c624660c7a46c05f8f36871744abd7b8d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1521487
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Raul Tambre <raul@tambre.ee>
Cr-Original-Commit-Position: refs/heads/master@{#641870}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 4197d3af6e42aa72076d6051153a644f3df62dd5
This reverts commit d17a7e3cc86ff480e081854b0c9a358ddf3112ac.
Reason for revert: Increase in heap corruption (and other?) crashes
in the d3dcompiler code path, such as crbug.com/932359. We have run
out of time to investigate before branching.
Original change's description:
> Switch to full 17763 SDK, including new d3dcompiler_47.dll
>
> The new (10.0.17763.0) version of d3dcompiler_47.dll contains various
> bug fixes which we want to ship. We initially avoided upgrading it with
> the rest of the SDK because it depends on the universal Windows 10 CRT
> (UCRT) which some Windows 7 machines lack. This caused test failures on
> some bots and would cause failures on some customer machines.
>
> This change updates how we package isolates so that they always include
> the UCRT, to avoid test failures. It also ships api-ms-win-*.dll and
> ucrtbase*.dll in mini_installer.exe so that the UCRT will be shipped to
> customers. The size increase to mini_installer.exe for this is about
> 400,000 bytes.
>
> This change also deletes an unused function (_read_configuration_from_gn)
> from create_installer_archive.py that sent me down an incorrect path
> while investigating fixes.
>
> The toolchain package is the same as the one used when landing
> crrev.com/c/1401403 except that the 17763 version of d3dcompiler_47.dll
> was retained. See that CL for full instructions on creating the
> toolchain package.
>
> Bug: 920704
> Change-Id: I9cb7a7ed5cb75d04962fc64869d26b12617c0463
> Reviewed-on: https://chromium-review.googlesource.com/c/1450414
> Reviewed-by: Greg Thompson <grt@chromium.org>
> Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#629193}
TBR=brucedawson@chromium.org,grt@chromium.org
Bug: 920704
Change-Id: Ia986017541e5e80a3cc5f1d96494e0e12a841ed1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1507040
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#638596}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 666e6630b5d3c15313ce5ff385eac85459c65623
On ARM64 Win32 builds the UCRT is not a redistributable and therefore
must be omitted from the list of outputs. Otherwise the
copy_cdb_to_output will never be clean.
This was tested before and after with this pair of commands:
ninja.exe -C out\arm64 copy_cdb_to_output
ninja.exe -d explain -C out\arm64 copy_cdb_to_output
Before the build step was always dirty. After it is always clean.
Bug: 937083
Change-Id: Ica53b1b172441925dcbb27f6033774d49b1df9af
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1497491
Auto-Submit: Bruce Dawson <brucedawson@chromium.org>
Commit-Queue: Justin DeWitt <dewittj@chromium.org>
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#637404}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: dd3e44cc62a0cb83a470f71749ac0f05f3c24838
In crrev.com/c/1450414 the logic for when the UCRT files were shipped
was updated to ensure that the files were shipped for all non-ARM64
builds, to support the latest d3dcompiler_47.dll. Except the Boolean
logic was backwards so we were trying to ship them on ARM64, which is
wrong. This means that component builds of the ARM64 mini_installer
fail because they try to copy the api-ms-win*.dll redist files and
those don't exist for ARM64.
That fixes the logic, including separating out the logic for the UCRT
and the rest of the CRT.
This was tested on ARM64 by building isolates for all four permutations
of is_debug and is_component_build and confirming that they all worked.
This may need updating if we change how we ship d3dcompiler_47.dll but
this is correct for now.
Bug: 931856, 920704
Change-Id: I45c418403e03d3ba19348ed98f273ee9c80a5003
Reviewed-on: https://chromium-review.googlesource.com/c/1476316
Reviewed-by: David Bienvenu <davidbienvenu@chromium.org>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#637003}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: e782c345fb9cfc5558a85fe3fe0ffe482d79a7b8
This reverts commit 6ddbac7f8b44ca9f4ef8adaf21229df9dec380a2.
Reason for revert: causing most ANGLE Windows tests to fail with:
[ RUN ] D3DTextureTest.GlColorspaceNotAllowedForTypedD3DTexture/ES2_D3D9
../../third_party/angle/src/tests/test_utils/ANGLETest.cpp(57): error: Failed
ensureInitialized(138): LoadLibrary(d3dcompiler_47.dll) failed. GetLastError=126
e.g. https://ci.chromium.org/p/chromium/builders/luci.chromium.try/win-angle-rel/872
Original change's description:
> Toolchain with d3dcompiler_old.dll included
>
> This switches Chromium for Windows to use a new toolchain package that
> is the same as the one landed in crrev.com/c/1450414 except that it
> includes both the new d3dcompiler_47.dll (from the 17763 SDK) and the
> old one (from the 17134 SDK). The two versions are so that most
> customers get the new version, with all of its bug fixes, while those
> who don't have proper UCRT installs will fall back to the old version.
> If there are enough of the latter then we can figure out a way to ship
> the UCRT beside chrome.exe so that they can get the fixes as well. If
> there are few enough of the latter then we can drop support for them.
>
> This change also removes the UCRT from installs, reverting a portion of
> crrev.com/c/1450414, and adds d3dcompiler_old.dll to installs.
>
> This toolchain package was created by copying d3dcompiler_47.dll from
> the win_sdk\Redist\D3D\{x64|x86} directories of the 17134 SDK to
> d3dcompiler_old.dll and repackaging the directory using the --repackage
> option of depot_tools\win_toolchain\package_from_installed.py.
>
> Note that the logic in build\win\BUILD.gn for when to package up the
> UCRT was incorrect (it would try to package it for ARM64 component
> builds) and that is corrected as well in this change.
>
> Angle can then use d3dcompiler_old.dll as a fallback, and record
> metrics about how often the fallback is used.
>
> Bug: 920704
> Change-Id: Ida96d8b9247789a429519c50b0663f183d72c800
> Reviewed-on: https://chromium-review.googlesource.com/c/1461679
> Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
> Reviewed-by: Jamie Madill <jmadill@google.com>
> Reviewed-by: Greg Thompson <grt@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#634207}
TBR=jmadill@google.com,brucedawson@chromium.org,grt@chromium.org
Change-Id: I0fbd1f963fdd4c3180715ff9eec38b7bb2c2bf4e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 920704
Reviewed-on: https://chromium-review.googlesource.com/c/1481670
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#634255}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 6f84ed3b4c8c26dc30642a91bb195943d1632cf3
This switches Chromium for Windows to use a new toolchain package that
is the same as the one landed in crrev.com/c/1450414 except that it
includes both the new d3dcompiler_47.dll (from the 17763 SDK) and the
old one (from the 17134 SDK). The two versions are so that most
customers get the new version, with all of its bug fixes, while those
who don't have proper UCRT installs will fall back to the old version.
If there are enough of the latter then we can figure out a way to ship
the UCRT beside chrome.exe so that they can get the fixes as well. If
there are few enough of the latter then we can drop support for them.
This change also removes the UCRT from installs, reverting a portion of
crrev.com/c/1450414, and adds d3dcompiler_old.dll to installs.
This toolchain package was created by copying d3dcompiler_47.dll from
the win_sdk\Redist\D3D\{x64|x86} directories of the 17134 SDK to
d3dcompiler_old.dll and repackaging the directory using the --repackage
option of depot_tools\win_toolchain\package_from_installed.py.
Note that the logic in build\win\BUILD.gn for when to package up the
UCRT was incorrect (it would try to package it for ARM64 component
builds) and that is corrected as well in this change.
Angle can then use d3dcompiler_old.dll as a fallback, and record
metrics about how often the fallback is used.
Bug: 920704
Change-Id: Ida96d8b9247789a429519c50b0663f183d72c800
Reviewed-on: https://chromium-review.googlesource.com/c/1461679
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Reviewed-by: Jamie Madill <jmadill@google.com>
Reviewed-by: Greg Thompson <grt@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#634207}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 6ddbac7f8b44ca9f4ef8adaf21229df9dec380a2
The 17763 version of d3dcompiler_47.dll requires ucrtbase.dll. Change
crrev.com/c/1450414 switched to this new version of d3dcompiler_47.dll
and adjusted the DLLs we ship in isolates but in the debug case it
only shipped ucrtbased.dll, not ucrtbase.dll. This fixes that.
Local testing shows that angle_end2end_tests.isolate now always contains
ucrtbase.dll.
Bug: 929295, 920704
Change-Id: I3bb64dde923407e94404073b8f8f9bfd57692eac
Reviewed-on: https://chromium-review.googlesource.com/c/1457018
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#629780}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: edd50d7b272da6b84fde414ad95802f119770510
The new (10.0.17763.0) version of d3dcompiler_47.dll contains various
bug fixes which we want to ship. We initially avoided upgrading it with
the rest of the SDK because it depends on the universal Windows 10 CRT
(UCRT) which some Windows 7 machines lack. This caused test failures on
some bots and would cause failures on some customer machines.
This change updates how we package isolates so that they always include
the UCRT, to avoid test failures. It also ships api-ms-win-*.dll and
ucrtbase*.dll in mini_installer.exe so that the UCRT will be shipped to
customers. The size increase to mini_installer.exe for this is about
400,000 bytes.
This change also deletes an unused function (_read_configuration_from_gn)
from create_installer_archive.py that sent me down an incorrect path
while investigating fixes.
The toolchain package is the same as the one used when landing
crrev.com/c/1401403 except that the 17763 version of d3dcompiler_47.dll
was retained. See that CL for full instructions on creating the
toolchain package.
Bug: 920704
Change-Id: I9cb7a7ed5cb75d04962fc64869d26b12617c0463
Reviewed-on: https://chromium-review.googlesource.com/c/1450414
Reviewed-by: Greg Thompson <grt@chromium.org>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#629193}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: d17a7e3cc86ff480e081854b0c9a358ddf3112ac
This change adds ARM64 support to the CDB.exe copy script. Also, since
ARM64 Windows is by definition Windows 10 1709+, the eventing-provider
and ucrtbase DLLs are shipped with the OS and do not need to be copied.
Bug: 893460
Change-Id: Ia278c4636bc1303c24f174df88f6232a2e403c82
Reviewed-on: https://chromium-review.googlesource.com/c/1399289
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#620533}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: aa675251d9e1778e19ac77c5bef290c2e78c04b0
Recent Windows 10 SDKs store the UCRT redist files in a different
directory so a change was landed to scan for the right directory to
handle old and new. However the glob call used a backslash and therefore
fails on Linux. This fixes that by using os.path.join.
Bug: 915036
Change-Id: I7f71b0e9300ac33964a05881525a5eba52203859
Reviewed-on: https://chromium-review.googlesource.com/c/1377503
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#617227}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 0778ef57fb5d7b77897bb321e0fe1451ae742d62
Recent versions of the 10.0.17763 SDK have rearranged the redist
directory where we find the UCRT DLLs. This change updates the
copy_cdb_to_output.py script so that it looks in the new (versioned)
directory first, and falls back to the old unversioned directory if that
doesn't work.
Without this change we still soon start seeing build failures when
using the locally installed toolchain on clean installs.
See also http://crrev.com/c/1370609 for the depot tools packaging
version of this change, and http://crrev.com/c/1371017 for the
vs_toolchain.py version of this change. Ideally this change would have
been made together with the vs_toolchain.py, but the break was found to
late. The try bots have now done full builds with the new SDK layout so
this should be the last change needed of this type.
Change-Id: I4c965c66296d2f0b6adad672a71c295ffb021c66
Reviewed-on: https://chromium-review.googlesource.com/c/1372222
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#615737}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 33f80443a11c321a12cb5337eea8dd46ecb0fecd
This change mostly contains build script change under //chrome/build only.
It is targeting MSVC arm64 toolset, but enable clang-cl
could be based on this change.
Bug: 893460
Change-Id: Ia6f69f067a97fcaeb77021c1019bc594b0859eda
Reviewed-on: https://chromium-review.googlesource.com/c/1272076
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Steven Valdez <svaldez@chromium.org>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#600083}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: d5bf20624a99401dcb6c9e6aee9244334008222b
Ideally, copy_cdb_to_output should depend on the files it's copying. But
since those live outside Chromium that's not really practical. Depending
on vs_toolchain.py is probably good enough; the important part is this
will force copy_cdb_to_output to run whenever the VS version changes.
Bug: 846313
Change-Id: Ie0596fb820ba71c40b65325d663f95c2bffe30a4
Reviewed-on: https://chromium-review.googlesource.com/1073451
Commit-Queue: Scott Graham <scottmg@chromium.org>
Reviewed-by: Scott Graham <scottmg@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#561893}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: bec05e14e8ac760ca6182f8cad11e1e8507758f4
This reverts commit 864136ef9686128f4afbfe6146cd3e2d08182d52.
Reason for revert:
While it seems this did trigger the cdb failures in crbug.com/846313,
it was not the root cause and reverting it didn't actually help.
Original change's description:
> Revert "Fixed SDK lookup for non C:\ Windows installation."
>
> This reverts commit 57fd44c74e13be05a3091976f9bcee39ee8f703e.
>
> Reason for revert: suspect for messing up symbols on Win7 bot
> @ crbug.com/846313
>
> Original change's description:
> > Fixed SDK lookup for non C:\ Windows installation.
> >
> > Bug: None
> > Change-Id: Ia0aa186d1d39b1beac8ce0152683f774ad5d2eaf
> > Reviewed-on: https://chromium-review.googlesource.com/1066065
> > Reviewed-by: Jochen Eisinger <jochen@chromium.org>
> > Commit-Queue: Jochen Eisinger <jochen@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#561063}
>
> TBR=jochen@chromium.org,yura.yaroshevich@gmail.com
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: 846313
> Change-Id: Id93a965aea5555961c539d47e05e79410894eff8
> Reviewed-on: https://chromium-review.googlesource.com/1072307
> Commit-Queue: Gabriel Charette <gab@chromium.org>
> Reviewed-by: Gabriel Charette <gab@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#561609}
TBR=gab@chromium.org,jochen@chromium.org,yura.yaroshevich@gmail.com
Bug: 846313
Change-Id: I9955a47bbe8a81a0dcf7befebfc422560f8a1cc4
Reviewed-on: https://chromium-review.googlesource.com/1073314
Reviewed-by: Hans Wennborg <hans@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#561873}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 2e7257da41fbc81029fae5f306ae8123ec975f0c
This will allow webrtc and v8 to share the configs.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.win:win-msvc-dbg
Bug: 653569
Change-Id: I41a4d9025f47fd3a9d6837f88c2bece108c213a8
Reviewed-on: https://chromium-review.googlesource.com/997794
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#548874}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 5a4f610ded51627273b1f05e83379b1ce8e3c6aa
This removes the is_syzyasan build flag and related build configuration.
Everything under the SYZYASAN define is either removed, or moved under
ADDRESS_SANITIZER, as e.g. the previously SyzyASAN-only heap corruption
debug URLs.
The DCHECK debug URL is now enabled and the activity tracker grabs a
stack trace when DCHECK_IS_ON(), instead of only under SYZYASAN.
The metrics system sets the is_asan_build bit in the system profile now
under ADDRESS_SANITIZER, against the day when we ship Clang ASAN builds.
The SyzyProf profiling support is removed.
To support the upcoming official build with configurable DCHECKs, the
channel string visible in chrome://settings/help is adorned with "DCheck".
The DEPS to fetch the Syzygy binary archive is left in place, as the
zap_timestamps.exe utility is still in use. Once LLD replaces the MSVC
linker, that can be removed without penalty, at which time the DEPS will
be scrubbed.
Bug: 821764
Change-Id: I08202da8f032f2350a589cfcda9e9b2edd147b7d
Reviewed-on: https://chromium-review.googlesource.com/980912
Reviewed-by: Will Harris <wfh@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: Chris Hamilton <chrisha@chromium.org>
Reviewed-by: Sébastien Marchand <sebmarchand@chromium.org>
Commit-Queue: Sigurður Ásgeirsson <siggi@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#546966}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 69d0bcdd9729d123d9ba030d9506f763f0e2e56f
Chrome cannot build with VS 2015 anymore. Having it listed as a
supported compiler can lead to confusion for new Chromium developers.
This change scrubs inappropriate '2015' references from the Chromium
repo.
Bug: 683729
Change-Id: I2e02bc31ae8fd57a31ac65f1bb8a45eb5a5cd433
Reviewed-on: https://chromium-review.googlesource.com/807526
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Reviewed-by: Scott Graham <scottmg@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#521829}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: cea79358b2c6f2d0d7834f3d153072fbe0bcc1a5
message_compiler.py checks to make sure its results match those
generated by mc.exe, but these checks are only valid for a given version
of mc.exe, because the output changes with every new Windows 10 SDK
version. The checking is disabled for SDK versions other than 10.0.15063
but only for .man files. This change extends the disabling of checking
for .mc files also, due to observed failures.
Bug: 774669
Change-Id: I618f68d8926b73621192e7933aea5d264fedd214
Reviewed-on: https://chromium-review.googlesource.com/807205
Reviewed-by: Scott Graham <scottmg@chromium.org>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#521577}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: fb4046a4b0fd9651c74c7dcd4638688c53937048
mc.exe's output for .man files is changing significantly in the
Fall Creator's SDK update.
Checking in outputs for multiple outputs means we'll never be able
to check in new baselines if the .man input changes, so we have
to decide on just one version. So get mc.exe's version and only
compare if it's the version that belongs to the SDK hash that's
the default in vs_toolchain.py.
We'll have to manually remember to update the checked-in output and
to bump the version number here after we update to the Fall SDK,
else we'll silently lose output checking for .man files, but that
seems like the lesser evil.
Bug: 774669
Change-Id: I841d10c53f60ea645cca1640e2a7be204ac0f31f
Reviewed-on: https://chromium-review.googlesource.com/735073
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#511280}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 02ba53c693281052d9b52d411f34d125f4bf40a3
This helper file is intended to be used with GN generation of
Visual Studio solutions. Because GN doesn't have the concept of
different architectures or configurations, it can only gen a single
solution. What the script does is take a bunch of different solutions
from different GN output directories and merges them into a single
"meta" solution.
This allows the user to have a single open instance of Visual
Studio which can manage different build configurations. A common
use case is to have 32-bit/64-bit and Debug Release in the same
IDE, switchable by using the drop down menus.
The solution is forced to use the "x64" platform due to limitations
in Visual Studio.
Based on skia's script: https://skia-review.googlesource.com/4158
BUG=angleproject:1569
Change-Id: I0882211ab8ca442623632764ee6bc135bde02307
Reviewed-on: https://chromium-review.googlesource.com/729133
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#511003}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: fcc7dabd24569a756d462e434a1bd4485cb7534e
This attempts to port https://github.com/google/syzygy/blob/master/syzygy/swapimport/swapimport_app.cc#L143
The motivation is to be able to run this on non-Windows hosts. This is
the last thing that's required to be able to link chrome.exe (with some
other local changes).
Not relying on a checked-in binary also makes changing the script easier.
Bug: 761849
Change-Id: I9956ce5c0929dcb3fd1309a8f0b2acc80b7b92ce
Reviewed-on: https://chromium-review.googlesource.com/649810
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Scott Graham <scottmg@chromium.org>
Reviewed-by: Chris Hamilton <chrisha@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#499824}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: cf357e4d70c3f537994bbbce771b678bc6ef2d3e
Some versions of mc.exe apparently don't do that, see chromium-dev
"message_compiler.py build failure due to innocent enum ordering changes"
Also print a slightly more detailed diff.
Bug: 756607
Change-Id: I100891d0d1d06256448e568b9fa0ed8938d5957b
Reviewed-on: https://chromium-review.googlesource.com/649768
Reviewed-by: Scott Graham <scottmg@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#499663}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 570a3b4c38a155a075e4370a37bf184c7d35bbd4
This reverts commit d000a95b5c7189076d3e6d61f243caef3edeaa48.
Reason for revert: Speculating that this CL has caused a tree closure - see https://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Win/builds/21668
Original change's description:
> mc: Copy over checked-in outputs on non-Windows hosts.
>
> On Windows hosts, verify that the checked-in outputs are identical to
> what mc.exe actually produces.
>
> Bug: 756607
> Change-Id: If827c2b5d64730a27cf409af25783794366c1843
> Reviewed-on: https://chromium-review.googlesource.com/646659
> Commit-Queue: Nico Weber <thakis@chromium.org>
> Reviewed-by: Scott Graham <scottmg@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#499221}
TBR=thakis@chromium.org,scottmg@chromium.org
Change-Id: I9d2dc77942bdba7198ed442cedb2f3d815510f9f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 756607
Reviewed-on: https://chromium-review.googlesource.com/648146
Reviewed-by: Łukasz Anforowicz <lukasza@chromium.org>
Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#499227}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: ea662297506102da12eb1ee04e40fad15b77a1d5
On Windows hosts, verify that the checked-in outputs are identical to
what mc.exe actually produces.
Bug: 756607
Change-Id: If827c2b5d64730a27cf409af25783794366c1843
Reviewed-on: https://chromium-review.googlesource.com/646659
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Scott Graham <scottmg@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#499221}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: d000a95b5c7189076d3e6d61f243caef3edeaa48
This has a bunch of minor advantages:
1. It's less code
2. It's a build step less per windows_manifest
3. /manifest:embed automatically sets 1 or 2 based on /dll, so
clients of windows_manifest() clients no longer need to set type
4. rc.exe is no longer required for every single binary, which
helps bootstrapping of cross-building some chrome/win binaries
on non-win
No intended behavior change.
TBR=sergeyu,grt
Bug: 495204
Cq-Include-Trybots: master.tryserver.chromium.win:win10_chromium_x64_rel_ng
Change-Id: I13cd9103829fa535997fa7a7e5ec009dbc1b8039
Reviewed-on: https://chromium-review.googlesource.com/585109
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Scott Graham <scottmg@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#489729}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 132e149a98b37ee78eaf86434dbe37f22fa40d4c
pgomgr.exe sometime fails to merge too many files at the same time, with
what seems to be a memory issue (process peak at ~4GB before failing,
it's a 64-bit process so it's probably a size_t/uint32_t issue). I've a
local repro that I'll send to MS, but in the meantime this fix is
required to fix the official build (and the PGO ones in general).
Bug: 729894
Change-Id: I9c862c0179de50ee89b22a03789c9fb0a1071d48
Reviewed-on: https://chromium-review.googlesource.com/528354
Commit-Queue: Sébastien Marchand <sebmarchand@chromium.org>
Reviewed-by: Scott Graham <scottmg@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#478066}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 0c6adbef4d5f4722e2a224c90164f30ec9cf26dd
pgomgr.exe has been moved to a different location in VS2017 so the logic
that find it should be updated.
It can't just be copied to the build directory because we always run the
x64 bit version of this binary (and we don't want to mix x86 and x64
binaries in the same build dir)
BUG=719319
Review-Url: https://codereview.chromium.org/2884613003
Cr-Original-Commit-Position: refs/heads/master@{#473438}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: ab3a1821bb57a51d11be2b038b3a698236ccd5fc
The PGO build is failing for the VS2017 binaries because some of the
dependencies (pgort140.dll, pgosweep.exe...) have moved to a different
directory of the toolchain.
There's also a change to the profiling script to use a copy of
pgosweep.exe from the build directory rather than the one in the
toolchain's directory, this is required in order to be able to use
Swarming for the profiling step (and this is probably cleaner because
it avoid duplicating the logic that find these runtime dependencies).
BUG=719319
Review-Url: https://codereview.chromium.org/2878693002
Cr-Original-Commit-Position: refs/heads/master@{#471299}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 79a9cbda265c5ab725a0a25d725980bd0b376439
This benchmark has been failing (timing out) for months now, so removing it won't affect the performance.
The issue seem to be that Speedometer takes a while to tun, and it's much slower in a PGI build, so we timeout after 10 minutes and at this
point the benchmark is still running. We could increase the timeout
but as mentioned above this has been failing for months and we haven't noticed a performance regression.
BUG=650432
Review-Url: https://codereview.chromium.org/2814103003
Cr-Original-Commit-Position: refs/heads/master@{#465682}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: aa335b32311ded1c056247d4a8baca404de732c6
Workaround for a flakyness in pgomgr.exe where it can run out of address
space while trying to merge all the PGC files at the same time.
This will also allow to upload the pgd file before running the optimize step.
BUG=674956
Review-Url: https://codereview.chromium.org/2575543002
Review-Url: https://codereview.chromium.org/2575543002
Cr-Original-Commit-Position: refs/heads/master@{#449082}
Committed: 6c18b1e861
Cr-Original-Original-Commit-Position: refs/heads/master@{#448332}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 4a19948e1bc13344a301c439445d36b44c207bb1
Reason for revert:
Breaks the PGO bots.
Original issue's description:
> Add a script to merge the PGC files.
>
> Workaround for a flakyness in pgomgr.exe where it can run out of address
> space while trying to merge all the PGC files at the same time.
>
> This will also allow to upload the pgd file before running the optimize step.
>
> BUG=674956
>
> Review-Url: https://codereview.chromium.org/2575543002
> Cr-Commit-Position: refs/heads/master@{#448332}
> Committed: 6c18b1e861TBR=scottmg@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=674956
Review-Url: https://codereview.chromium.org/2680683002
Cr-Original-Commit-Position: refs/heads/master@{#448561}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 6c2f8b4bd17f67d03b3e4d85401a0eaa68597afa
Workaround for a flakyness in pgomgr.exe where it can run out of address
space while trying to merge all the PGC files at the same time.
This will also allow to upload the pgd file before running the optimize step.
BUG=674956
Review-Url: https://codereview.chromium.org/2575543002
Cr-Original-Commit-Position: refs/heads/master@{#448332}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 6c18b1e861ec6a9c96d24b3bd962688e50c83597
VS 2015 Update 3 offers numerous improvements such as improved
language conformance, fixes to avoid linker crashes, and
improved code-gen for faster performance. Update 3 also resolves
some problems with incremental linking silently falling back to
a full link.
It also fixes an internal compiler error in /analyze builds.
The landmines change is needed because otherwise things like the
out\Release\cdb directory do not get regenerated.
The process for creating this package is:
- Create a clean Windows VM running Windows Server 2012 R2 (en_windows_server_2012_r2_vl_with_update_x64_dvd_6052766.iso, SHA1: 247EAEE5628850A41F0C51471656AAFB2492EA08, Standard Edition)
- Install depot tools, run ‘gclient’, and add depot_tools to the path
- Install VS 2015 Professional Update 3 - must have been installed after July 12th to get the latest fixes - with these settings and nothing else:
* Visual C++ and make sure the three nodes underneath are also selected
* Under Universal Windows App Development Tools make sure the "Tools (1.4.1) and Windows 10 SDK (10.0.14393)" and the "Windows 10 SDK (10.0.10586)" nodes are selected and nothing else
- Copy the *Debugger and Tools*.msi installers from another machine and run them. The 10.0.14393 versions (Anniversary Edition) should be used.
- Then run:
python depot_tools\win_toolchain\package_from_installed.py 2015
It is also possible to package the 14393 SDK by running this command,
but that change is being saved for later:
python depot_tools\win_toolchain\package_from_installed.py 2015 -w 10.0.14393.0
BUG=627216,636468,427616,637456
Review-Url: https://codereview.chromium.org/2106203002
Cr-Original-Commit-Position: refs/heads/master@{#417157}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 02343c661ee0482cb73ad0cf861999f2c57eeb11
Raul Tambre
Bruce Dawson
Jamie Madill
Jon Kunkee
Sebastien Marchand
Tom Tan
Hans Wennborg
Gabriel Charette
Yura Yaroshevich
Michael Achenbach
Sigurdur Asgeirsson
Scott Graham
Nico Weber
Łukasz Anforowicz
perezju
jochen
brettw