From aafcf932bccde535dc67708ab1d333bc7e340c6f Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Thu, 5 Nov 2020 13:56:15 -0800
Subject: [PATCH] browser(firefox): bundle VS C++ redistributable dlls (#4359)

---
 browser_patches/firefox/BUILD_NUMBER | 4 ++--
 browser_patches/firefox/build.sh     | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/browser_patches/firefox/BUILD_NUMBER b/browser_patches/firefox/BUILD_NUMBER
index b20f532043..e6bf612be3 100644
--- a/browser_patches/firefox/BUILD_NUMBER
+++ b/browser_patches/firefox/BUILD_NUMBER
@@ -1,2 +1,2 @@
-1201
-Changed: lushnikov@chromium.org Tue 03 Nov 2020 02:16:18 PM PST
+1202
+Changed: yurys@chromium.org Thu Nov  5 20:30:30 GMTST 2020
diff --git a/browser_patches/firefox/build.sh b/browser_patches/firefox/build.sh
index a9601f32bd..e06e112014 100755
--- a/browser_patches/firefox/build.sh
+++ b/browser_patches/firefox/build.sh
@@ -26,13 +26,22 @@ elif [[ "$(uname)" == "Linux" ]]; then
   echo "-- building on Linux"
   echo "ac_add_options --disable-av1" > .mozconfig
 elif [[ "$(uname)" == MINGW* ]]; then
+  TMPFILE=$(mktemp)
   if [[ $1 == "--win64" ]]; then
     echo "-- building win64 build on MINGW"
     echo "ac_add_options --target=x86_64-pc-mingw32" > .mozconfig
     echo "ac_add_options --host=x86_64-pc-mingw32" >> .mozconfig
+    "$PROGRAMFILES\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find '**\Redist\MSVC\*\x64\**\vcruntime140.dll' > $TMPFILE
   else
     echo "-- building win32 build on MINGW"
+    "$PROGRAMFILES\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find '**\Redist\MSVC\*\x86\**\vcruntime140.dll' > $TMPFILE
   fi
+  WIN32_REDIST_DIR=$(dirname "$(cat $TMPFILE)")
+  if ! [[ -d $WIN32_REDIST_DIR ]]; then
+    echo "Error: cannot find MS VS C++ redistributable $WIN32_REDIST_DIR"
+    exit 1;
+  fi
+  echo "export WIN32_REDIST_DIR=\"$WIN32_REDIST_DIR\"" >> .mozconfig
 else
   echo "ERROR: cannot upload on this platform!" 1>&2
   exit 1;