Bug 1523537 - Remove WIN_DIA_SDK_BIN_DIR as a thing that can be set m…

…anually. r=dmajor

Now that it's automatically derived and that in-tree mozconfigs are
setting DIA_SDK_PATH, we don't need to set WIN_DIA_SDK_BIN_DIR on
automation, or elsewhere, for that matter.

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

--HG--
extra : moz-landing-system : lando

build/moz.configure/windows.configure

@@ -358,21 +358,7 @@ def dia_sdk_subdir(host_or_target, subdir):
     return dia_sdk_subdir
 
 
-# XXX: remove after bug 1523201
-js_option(env='WIN_DIA_SDK_BIN_DIR', nargs=1, help='Path to the DIA DLLs')
-
-
-@depends('WIN_DIA_SDK_BIN_DIR', dia_sdk_subdir(host, 'bin'))
-@imports('os')
-def dia_sdk_bin_dir(from_env, guessed):
-    if from_env:
-        if not os.path.isdir(from_env[0]):
-            die('Invalid Windows DIA SDK directory: {}'.format(from_env))
-        return from_env[0]
-    return guessed
-
-
-set_config('WIN_DIA_SDK_BIN_DIR', dia_sdk_bin_dir)
+set_config('WIN_DIA_SDK_BIN_DIR', dia_sdk_subdir(host, 'bin'))
 
 
 @template

build/win32/mozconfig.vs2017

@@ -9,7 +9,6 @@ if [ -d "${VSPATH}" ]; then
     export WINDOWSSDKDIR="${VSWINPATH}/SDK"
     export WIN32_REDIST_DIR="${VSPATH}/VC/redist/x86/Microsoft.VC141.CRT"
     export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x86"
-    export WIN_DIA_SDK_BIN_DIR="${VSPATH}/DIA SDK/bin/amd64"
     export DIA_SDK_PATH="${VSPATH}/DIA SDK"
     export VC_PATH="${VSPATH}/VC"
 

build/win64-aarch64/mozconfig.vs2017

@@ -8,7 +8,6 @@ if [ -d "${VSPATH}" ]; then
 
     export WINDOWSSDKDIR="${VSWINPATH}/SDK"
     export WIN32_REDIST_DIR=${VSPATH}/VC/redist/arm64/Microsoft.VC141.CRT
-    export WIN_DIA_SDK_BIN_DIR="${VSPATH}/DIA SDK/bin/amd64"
     export DIA_SDK_PATH="${VSPATH}/DIA SDK"
     export VC_PATH="${VSPATH}/VC"
 

build/win64/mozconfig.vs2017

@@ -9,7 +9,6 @@ if [ -d "${VSPATH}" ]; then
     export WINDOWSSDKDIR="${VSWINPATH}/SDK"
     export WIN32_REDIST_DIR=${VSPATH}/VC/redist/x64/Microsoft.VC141.CRT
     export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x64"
-    export WIN_DIA_SDK_BIN_DIR="${VSPATH}/DIA SDK/bin/amd64"
     export DIA_SDK_PATH="${VSPATH}/DIA SDK"
     export VC_PATH="${VSPATH}/VC"
 fi