Use rmdir /s/q instead of flaky shutil.rmtree on Windows

For unknown reasons (Windows!) shutil.rmtree has been failing frequently
when the landmines change due to a toolchain change. This avoids the
the problem. This is necessary because manually deleting the 'out'
directory causes args.gn to get lost, which is a hassle.

This was noticed because the VS 2015 toolchain upgrades kept failing
to clobber the out directory on multiple machines.

Review URL: https://codereview.chromium.org/1812673003

Cr-Commit-Position: refs/heads/master@{#382140}

1 files changed, 12 insertions, 2 deletions

diff --git a/build/clobber.py b/build/clobber.py
index 785011a..c05f524 100755
--- a/build/clobber.py
+++ b/build/clobber.py
@@ -8,6 +8,7 @@
 import argparse
 import os
 import shutil
+import subprocess
 import sys
 
 
@@ -35,11 +36,20 @@ def extract_gn_build_commands(build_ninja_file):
   return result
 
 
+def delete_dir(build_dir):
+  # For unknown reasons (anti-virus?) rmtree of Chromium build directories
+  # often fails on Windows.
+  if sys.platform.startswith('win'):
+    subprocess.check_call(['rmdir', '/s', '/q', build_dir], shell=True)
+  else:
+    shutil.rmtree(build_dir)
+
+
 def delete_build_dir(build_dir):
   # GN writes a build.ninja.d file. Note that not all GN builds have args.gn.
   build_ninja_d_file = os.path.join(build_dir, 'build.ninja.d')
   if not os.path.exists(build_ninja_d_file):
-    shutil.rmtree(build_dir)
+    delete_dir(build_dir)
     return
 
   # GN builds aren't automatically regenerated when you sync. To avoid
@@ -56,7 +66,7 @@ def delete_build_dir(build_dir):
   except IOError:
     args_contents = ''
 
-  shutil.rmtree(build_dir)
+  delete_dir(build_dir)
 
   # Put back the args file (if any).
   os.mkdir(build_dir)