Bug 1796039 - Get pdbstr from Visual Studio artifact. r=firefox-build-system-reviewers,andi

Before bug 1289641, we didn't have pdbstr in the VS artifact, but we now
do as a side effect of using vsdownload. So instead of exfiltrating the
file from a Windows worker, we can just use the one from VS.

Differential Revision: https://phabricator.services.mozilla.com/D159659

browser/config/mozconfigs/win32/common-win32

@@ -17,8 +17,3 @@ mk_add_options "export PATH=${VC_PATH}/bin/hostx64/x86:${PATH}"
 unset VC_PATH
 
 fi
-
-pdbstr="${MOZ_FETCHES_DIR}/pdbstr/pdbstr.exe"
-if [ -f "${pdbstr}" ]; then
-    chmod +x "${pdbstr}"
-fi

browser/config/mozconfigs/win64-aarch64/common-win64

@@ -18,8 +18,3 @@ mk_add_options "export WINEPATH=${VC_PATH}/bin/hostx64/x64"
 unset VC_PATH
 
 fi
-
-pdbstr="${MOZ_FETCHES_DIR}/pdbstr/pdbstr.exe"
-if [ -f "${pdbstr}" ]; then
-    chmod +x "${pdbstr}"
-fi

browser/config/mozconfigs/win64/common-win64

@@ -17,8 +17,3 @@ mk_add_options "export PATH=${VC_PATH}/bin/hostx64/x64:${PATH}"
 unset VC_PATH
 
 fi
-
-pdbstr="${MOZ_FETCHES_DIR}/pdbstr/pdbstr.exe"
-if [ -f "${pdbstr}" ]; then
-    chmod +x "${pdbstr}"
-fi

taskcluster/ci/build/windows.yml

@@ -5,9 +5,6 @@
 job-defaults:
     run:
         using: mozharness
-    fetches:
-        toolchain:
-            - win64-pdbstr
 
 win32/debug:
     description: "Win32 Debug"

taskcluster/ci/toolchain/misc.yml

@@ -211,38 +211,6 @@ linux64-wine:
         fetch:
             - wine
 
-win32-pdbstr:
-    description: "pdbstr for 32-bits Windows"
-    treeherder:
-        symbol: TW32(pdbstr)
-    worker-type: b-win2012
-    worker:
-        artifacts:
-            - name: project/gecko/pdbstr/pdbstr.tar.zst
-              path: pdbstr.tar.zst
-              type: file
-    run:
-        script: exfiltrate-pdbstr.sh
-        arguments: ['x86']
-        toolchain-artifact: project/gecko/pdbstr/pdbstr.tar.zst
-
-win64-pdbstr:
-    description: "pdbstr for 64-bits Windows"
-    attributes:
-        local-toolchain: true
-    treeherder:
-        symbol: TW64(pdbstr)
-    worker-type: b-win2012
-    worker:
-        artifacts:
-            - name: project/gecko/pdbstr/pdbstr.tar.zst
-              path: pdbstr.tar.zst
-              type: file
-    run:
-        script: exfiltrate-pdbstr.sh
-        arguments: ['x64']
-        toolchain-artifact: project/gecko/pdbstr/pdbstr.tar.zst
-
 linux64-winchecksec:
     description: "winchecksec"
     attributes:

taskcluster/scripts/misc/exfiltrate-pdbstr.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -x -e -v
-
-# Copy the file that already exists on Windows workers.
-mkdir pdbstr
-cp "c:/Program Files (x86)/Windows Kits/10/Debuggers/$1/srcsrv/pdbstr.exe" pdbstr
-
-tar -c pdbstr | python3 $GECKO_PATH/taskcluster/scripts/misc/zstdpy > pdbstr.tar.zst

toolkit/moz.configure

@@ -2555,12 +2555,30 @@ check_prog(
 )
 
 
+@depends(valid_windows_sdk_dir, host)
+@imports(_from="os", _import="environ")
+def pdbstr_paths(valid_windows_sdk_dir, host):
+    if not valid_windows_sdk_dir:
+        return
+
+    vc_host = {
+        "x86": "x86",
+        "x86_64": "x64",
+    }.get(host.cpu)
+
+    return [
+        environ["PATH"],
+        os.path.join(valid_windows_sdk_dir.path, "Debuggers", vc_host, "srcsrv"),
+    ]
+
+
 check_prog(
     "PDBSTR",
     ["pdbstr.exe"],
     allow_missing=True,
-    bootstrap="pdbstr",
     when=compile_environment & target_is_windows,
+    paths=pdbstr_paths,
+    allow_spaces=True,
 )