From f9a86c0781ca48772088d91887da7c6416b3896e Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Fri, 17 Jan 2020 11:59:41 -0800
Subject: [PATCH] devops(win): fix webkit-win64 archiving step

---
 browser_patches/buildbots/README.md | 12 ++++++++++++
 browser_patches/webkit/archive.sh   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/browser_patches/buildbots/README.md b/browser_patches/buildbots/README.md
index 9491d41637..0aed65ac26 100644
--- a/browser_patches/buildbots/README.md
+++ b/browser_patches/buildbots/README.md
@@ -105,6 +105,18 @@ The `core.longpaths` is needed for webkit since it has some very long layout pat
 
 Run `c:\mozilla-build\start-shell.bat` and checkout PlayWright repo to `/c/playwright`.
 
+### 7. Create a c:\WEBKIT_WIN64_LIBS\ directory with win64 dlls
+
+
+Create a new `c:\WEBKIT_WIN64_LIBS` folder and copy the following libraries from `C:\Windows\System32` into it:
+- `msvcp140.dll`
+- `vcruntime140.dll`
+- `vcruntime140_1.dll`
+
+> **NOTE**: these libraries are expected by `//browser_patches/webkit/archive.sh`. 
+
+This is necessary since mingw is a 32-bit application and cannot access the `C:\Windows\System32` folder due to [Windows FileSystem Redirector](https://docs.microsoft.com/en-us/windows/win32/winprog64/file-system-redirector?redirectedfrom=MSDN). ([StackOverflow question](https://stackoverflow.com/questions/18982551/is-mingw-caching-windows-directory-contents)) 
+
 ## Running Build Loop
 
 1. Launch `c:\mozilla-build/start-shell.bat`
diff --git a/browser_patches/webkit/archive.sh b/browser_patches/webkit/archive.sh
index 3121c241d4..e481d2c29c 100755
--- a/browser_patches/webkit/archive.sh
+++ b/browser_patches/webkit/archive.sh
@@ -83,7 +83,7 @@ createZipForWindows() {
   cp -t $tmpdir JavaScriptCore.dll MiniBrowserLib.dll WTF.dll WebKit.dll WebKit2.dll libEGL.dll libGLESv2.dll
   cp -t $tmpdir MiniBrowser.exe WebKitNetworkProcess.exe WebKitWebProcess.exe
   cd -
-  cd C:/Windows/System32
+  cd /c/WEBKIT_WIN64_LIBS
   cp -t $tmpdir msvcp140.dll vcruntime140.dll vcruntime140_1.dll
   cd -