Handle case where WINDOWSSDKDIR is not set

build/win/copy_cdb_to_output.py

Index: build/win/copy_cdb_to_output.py
diff --git a/build/win/copy_cdb_to_output.py b/build/win/copy_cdb_to_output.py
index 1354336f07a5fdc400173aba8286c9569bb15a4b..51927379fbebf796e8e14f2fc90be6acf4677528 100755
--- a/build/win/copy_cdb_to_output.py
+++ b/build/win/copy_cdb_to_output.py
@@ -53,7 +53,11 @@ def _CopyCDBToOutput(output_dir, target_arch):
   if not os.path.isdir(output_dir):
     os.makedirs(output_dir)
   vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
-  win_sdk_dir = os.path.normpath(os.environ['WINDOWSSDKDIR'])
+  # If WINDOWSSDKDIR is not set use the default SDK path. This will be the case
+  # when DEPOT_TOOLS_WIN_TOOLCHAIN=0 and vcvarsall.bat has not been run.
+  win_sdk_dir = os.path.normpath(
+      os.environ.get('WINDOWSSDKDIR',
+      'C:\\Program Files (x86)\\Windows Kits\\10'))

[scottmg, 2016/06/01 23:38:05]

This indent is wrong and makes it look like it's the second argument to
normpath. It should be under 'WINDOWSSDKDIR'.

[brucedawson, 2016/06/02 00:17:11]

Uggh. Yeah. I was apparently too focused on looking up the correct indication
for the previous line in the Python style guide. Okay, fixed.

   if target_arch == 'ia32' or target_arch == 'x86':
     src_arch = 'x86'
   elif target_arch == 'x64':