From c8bbf8808b7f6d2ba2739f7bdd3c63e6c827f6e1 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Mon, 9 Mar 2020 11:43:11 -0700 Subject: [PATCH] devops: bundle mvscp140_2.dll with windows webkit (#1293) Fixes #1288 --- browser_patches/buildbots/README.md | 1 + browser_patches/webkit/archive.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/browser_patches/buildbots/README.md b/browser_patches/buildbots/README.md index 8fade4e8a3668..dc5dfd20156e4 100644 --- a/browser_patches/buildbots/README.md +++ b/browser_patches/buildbots/README.md @@ -108,6 +108,7 @@ Run `c:\mozilla-build\start-shell.bat` and checkout Playwright repo to `/c/playw Create a new `c:\WEBKIT_WIN64_LIBS` folder and copy the following libraries from `C:\Windows\System32` into it: - `msvcp140.dll` +- `msvcp140_2.dll` - `vcruntime140.dll` - `vcruntime140_1.dll` diff --git a/browser_patches/webkit/archive.sh b/browser_patches/webkit/archive.sh index c47cee5fe0e37..baa67e8a59dfd 100755 --- a/browser_patches/webkit/archive.sh +++ b/browser_patches/webkit/archive.sh @@ -103,7 +103,7 @@ createZipForWindows() { cp -t $tmpdir MiniBrowser.exe WebKitNetworkProcess.exe WebKitWebProcess.exe cd - cd /c/WEBKIT_WIN64_LIBS - cp -t $tmpdir msvcp140.dll vcruntime140.dll vcruntime140_1.dll + cp -t $tmpdir msvcp140.dll vcruntime140.dll vcruntime140_1.dll msvcp140_2.dll cd - # copy protocol