diff options
| author | vmiura <vmiura@chromium.org> | 2016-03-11 20:35:38 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-12 04:36:59 +0000 |
| commit | 76311f1cf896615df4fa82b8421ae81cec9b7873 (patch) | |
| tree | cf289630eba7a39cbb832e26514effc4a7e07ff4 | |
| parent | e39f7570eb72a6c3bdc6b236ccb1843eff8052b5 (diff) | |
| download | chromium_src-76311f1cf896615df4fa82b8421ae81cec9b7873.zip chromium_src-76311f1cf896615df4fa82b8421ae81cec9b7873.tar.gz chromium_src-76311f1cf896615df4fa82b8421ae81cec9b7873.tar.bz2 | |
Revert of Fix mini_installer to handle VS 2015 component builds (patchset #1 id:1 of https://codereview.chromium.org/1787883005/ )
Reason for revert:
Suspect this has caused Win32 builders to break.
BUG=594322
Original issue's description:
> Fix mini_installer to handle VS 2015 component builds
>
> The mini_installer needs to unpack more CRT DLLs now that we are using
> VS 2015. This change supports that, while still being VS 2013
> compatible.
>
> TBR=gab@chromium.org
> BUG=594294
>
> Committed: https://crrev.com/9ec74cd783f5a5eff2d5750f3bd072d5a577e0e4
> Cr-Commit-Position: refs/heads/master@{#380833}
TBR=dpranke@chromium.org,stanisc@chromium.org,gab@chromium.org,brucedawson@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=594294
Review URL: https://codereview.chromium.org/1791483004
Cr-Commit-Position: refs/heads/master@{#380838}
| -rwxr-xr-x | chrome/tools/build/win/create_installer_archive.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/tools/build/win/create_installer_archive.py b/chrome/tools/build/win/create_installer_archive.py index 4c16945..d320363 100755 --- a/chrome/tools/build/win/create_installer_archive.py +++ b/chrome/tools/build/win/create_installer_archive.py @@ -502,9 +502,7 @@ def DoComponentBuildTasks(staging_dir, build_dir, target_arch, current_version): 'crcrypto.dll', 'icui18n.dll', 'icuuc.dll', - 'msvc*.dll', - 'api-ms-win-*.dll', - 'vcruntime*.dll' ] + 'msvc*.dll' ] for setup_component_dll_glob in setup_component_dll_globs: setup_component_dlls = glob.glob(os.path.join(build_dir, setup_component_dll_glob)) |