reclient_cfgs: change win cross config paths

- use win-cross rather than win-cross-experiments
- until reclient_cfgs cipd changes the win cross dir,
  use win-cross-experiments/*.cfg if exists

Bug: 1407557
Change-Id: Id477b5dfcbd6f0ab5a88338bbd7ba022610e8896
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4169917
Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Cr-Commit-Position: refs/heads/main@{#1093707}

buildtools/reclient_cfgs/.gitignore

@@ -1,5 +1,7 @@
 /chromium-browser-clang/
 /nacl/
 /python/
+/win-cross/
+# TODO(crbug.com/1407557): remove win-cross-experiments
 /win-cross-experiments/
 reproxy.cfg

buildtools/reclient_cfgs/fetch_reclient_cfgs.py

@@ -87,20 +87,24 @@ def main():
       CipdEnsure(posixpath.join(cipd_prefix, toolchain),
                   ref=cipd_ref,
                   directory=toolchain_root)
-      if os.path.exists(os.path.join(toolchain_root, 'win-cross-experiments')):
-        # copy in win-cross-experiments/toolchain
-        # as windows may not use symlinks.
-        wcedir = os.path.join(THIS_DIR, 'win-cross-experiments', toolchain)
-        if not os.path.exists(wcedir):
+      # support legacy (win-cross-experiments) and new (win-cross)
+      # TODO(crbug.com/1407557): drop -experiments support
+      wcedir = os.path.join(THIS_DIR, 'win-cross', toolchain)
+      if not os.path.exists(wcedir):
           os.makedirs(wcedir, mode=0o755)
-        for cfg in glob.glob(os.path.join(THIS_DIR, toolchain,
-                                          'win-cross-experiments', '*.cfg')):
-          fname = os.path.join(wcedir, os.path.basename(cfg))
-          if os.path.exists(fname):
-            os.chmod(fname, 0o777)
-            os.remove(fname)
-          print('Copy from %s to %s...' % (cfg, fname))
-          shutil.copy(cfg, fname)
+      for win_cross_cfg_dir in ['win-cross','win-cross-experiments']:
+          if os.path.exists(os.path.join(toolchain_root, win_cross_cfg_dir)):
+              # copy in win-cross*/toolchain
+              # as windows may not use symlinks.
+              for cfg in glob.glob(os.path.join(toolchain_root,
+                                                win_cross_cfg_dir,
+                                                '*.cfg')):
+                  fname = os.path.join(wcedir, os.path.basename(cfg))
+                  if os.path.exists(fname):
+                    os.chmod(fname, 0o777)
+                    os.remove(fname)
+                  print('Copy from %s to %s...' % (cfg, fname))
+                  shutil.copy(cfg, fname)
 
     return 0
 

tools/mb/mb_config.pyl

@@ -4530,7 +4530,7 @@
 
     # experiment windows cross. crbug.com/1213717
     'reclient_win_cross': {
-      'gn_args': 'use_remoteexec=true rbe_cfg_dir="../../buildtools/reclient_cfgs/win-cross-experiments"',
+      'gn_args': 'use_remoteexec=true rbe_cfg_dir="../../buildtools/reclient_cfgs/win-cross"',
     },
 
     # Historically, a 'release' bot had DCHECKs turned off. DCHECKs are now

tools/mb/mb_config_expectations/chromium.fyi.json

@@ -549,7 +549,7 @@
       "is_component_build": false,
       "is_debug": false,
       "proprietary_codecs": true,
-      "rbe_cfg_dir": "../../buildtools/reclient_cfgs/win-cross-experiments",
+      "rbe_cfg_dir": "../../buildtools/reclient_cfgs/win-cross",
       "symbol_level": 1,
       "use_remoteexec": true
     }
@@ -561,7 +561,7 @@
       "is_component_build": false,
       "is_debug": false,
       "proprietary_codecs": true,
-      "rbe_cfg_dir": "../../buildtools/reclient_cfgs/win-cross-experiments",
+      "rbe_cfg_dir": "../../buildtools/reclient_cfgs/win-cross",
       "symbol_level": 1,
       "use_remoteexec": true
     }