From 79856664eb08b34756cd961a01387ec7bfe1177b Mon Sep 17 00:00:00 2001
From: Brian Ting <brianting@google.com>
Date: Wed, 8 Jan 2025 16:44:27 -0800
Subject: [PATCH] Remove fetching of RBE cfg files.

Remove fetching of RBE cfg files with CIPD. Instead rely on local cfg
files which use public docker images rather than private ones. Taken
from Chromium's trunk.

b/384982606
---
 build/toolchain/rbe.gni                         | 7 ++-----
 buildtools/reclient_cfgs/fetch_reclient_cfgs.py | 5 +++--
 buildtools/reclient_cfgs/rewrapper_linux_cc.cfg | 8 ++++++++
 buildtools/reclient_cfgs/rewrapper_linux_py.cfg | 8 ++++++++
 4 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 buildtools/reclient_cfgs/rewrapper_linux_cc.cfg
 create mode 100644 buildtools/reclient_cfgs/rewrapper_linux_py.cfg

diff --git a/build/toolchain/rbe.gni b/build/toolchain/rbe.gni
index cd86e22c01ef..e3ebf5f54816 100644
--- a/build/toolchain/rbe.gni
+++ b/build/toolchain/rbe.gni
@@ -24,11 +24,8 @@ declare_args() {
   # Set to the path of the RBE reclient configuration files.
   # Configuration file selection based on operating system.
   if (is_linux || is_android || is_chromeos || is_fuchsia) {
-    rbe_py_cfg_file = "${rbe_cfg_dir}/python/rewrapper_linux.cfg"
-    rbe_cc_cfg_file =
-        "${rbe_cfg_dir}/chromium-browser-clang/rewrapper_linux.cfg"
-    rbe_link_cfg_file =
-        "${rbe_cfg_dir}/chromium-browser-clang/rewrapper_linux_link.cfg"
+    rbe_py_cfg_file = "${rbe_cfg_dir}/rewrapper_linux_py.cfg"
+    rbe_cc_cfg_file = "${rbe_cfg_dir}/rewrapper_linux_cc.cfg"
   } else if (is_win) {
     rbe_py_cfg_file = "${rbe_cfg_dir}/python/rewrapper_windows.cfg"
     rbe_cc_cfg_file =
diff --git a/buildtools/reclient_cfgs/fetch_reclient_cfgs.py b/buildtools/reclient_cfgs/fetch_reclient_cfgs.py
index fc6b2d5e82f2..961f6ef3a6c0 100755
--- a/buildtools/reclient_cfgs/fetch_reclient_cfgs.py
+++ b/buildtools/reclient_cfgs/fetch_reclient_cfgs.py
@@ -135,8 +135,9 @@ def main():
             logging.error(
               '--rbe_instance is required if --reproxy_cfg_template is set')
             return 1
-        if not GenerateReproxyCfg(args.reproxy_cfg_template, args.rbe_instance):
-           return 1
+        if GenerateReproxyCfg(args.reproxy_cfg_template, args.rbe_instance):
+           return 0
+    return 1
 
     if not args.rewrapper_cfg_project and not args.rbe_instance:
         logging.error(
diff --git a/buildtools/reclient_cfgs/rewrapper_linux_cc.cfg b/buildtools/reclient_cfgs/rewrapper_linux_cc.cfg
new file mode 100644
index 000000000000..37fca98f4353
--- /dev/null
+++ b/buildtools/reclient_cfgs/rewrapper_linux_cc.cfg
@@ -0,0 +1,8 @@
+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,label:action_default=1
+server_address=unix:///tmp/reproxy.sock
+labels=type=compile,compiler=clang,lang=cpp
+exec_strategy=remote_local_fallback
+dial_timeout=10m
+exec_timeout=2m
+reclient_timeout=2m
+canonicalize_working_dir=true
diff --git a/buildtools/reclient_cfgs/rewrapper_linux_py.cfg b/buildtools/reclient_cfgs/rewrapper_linux_py.cfg
new file mode 100644
index 000000000000..12ae5379c2fe
--- /dev/null
+++ b/buildtools/reclient_cfgs/rewrapper_linux_py.cfg
@@ -0,0 +1,8 @@
+platform=container-image=docker://gcr.io/chops-public-images-prod/rbe/siso-chromium/linux@sha256:26de99218a1a8b527d4840490bcbf1690ee0b55c84316300b60776e6b3a03fe1,label:action_default=1
+server_address=unix:///tmp/reproxy.sock
+labels=type=tool
+exec_strategy=remote_local_fallback
+dial_timeout=10m
+canonicalize_working_dir=true
+exec_timeout=2m
+reclient_timeout=2m