Adds RBE local and remote wrappers for Linux and Android (#854)

For flutter/flutter#147750. This change also disables remote linking in anticipation of changing to differently sized workers in the worker pool. Validated in flutter/engine#52675.
flutter · May 9, 2024 · 70a4231 · 70a4231
1 parent b55755a
commit 70a4231
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/build/toolchain/android/BUILD.gn b/build/toolchain/android/BUILD.gn
@@ -44,12 +44,26 @@ template("android_toolchain") {
       compiler_prefix = "$goma_dir/gomacc "
       link_prefix = "$goma_dir/gomacc "
     } else if (use_rbe) {
-      compiler_args =
-          rewrapper_command + [ "--labels=type=compile,compiler=clang,lang=cpp " ]
-      link_args = rewrapper_command + [ "--labels=type=link,tool=clang " ]
+      remote_wrapper = ""
+      if (host_os == "linux") {
+        remote_wrapper =
+            rebase_path("//flutter/build/rbe/remote_wrapper_linux.sh", root_build_dir)
+      } else if (host_os == "mac") {
+        remote_wrapper =
+            rebase_path("//flutter/build/rbe/remote_wrapper.sh", root_build_dir)
+      } else {
+        assert(false, "Unknown host")
+      }
+      local_wrapper =
+          rebase_path("//flutter/build/rbe/local_wrapper.sh", root_build_dir)
+      compiler_args = rewrapper_command + [
+        "--remote_wrapper=$remote_wrapper",
+        "--local_wrapper=$local_wrapper",
+        "--labels=type=compile,compiler=clang,lang=cpp ",
+      ]
       assembler_prefix = ""
       compiler_prefix = string_join(" ", compiler_args)
-      link_prefix = string_join(" ", link_args)
+      link_prefix = ""
     } else if (use_ccache) {
       assembler_prefix = "ccache "
       compiler_prefix = "ccache "

diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn
@@ -19,11 +19,17 @@ if (use_goma) {
   compiler_prefix = "$goma_dir/gomacc "
   link_prefix = "$goma_dir/gomacc "
 } else if (use_rbe) {
-  compiler_args =
-      rewrapper_command + [ "--labels=type=compile,compiler=clang,lang=cpp " ]
-  link_args = rewrapper_command + [ "--labels=type=link,tool=clang " ]
+  remote_wrapper =
+      rebase_path("//flutter/build/rbe/remote_wrapper_linux.sh", root_build_dir)
+  local_wrapper =
+      rebase_path("//flutter/build/rbe/local_wrapper.sh", root_build_dir)
+  compiler_args = rewrapper_command + [
+    "--remote_wrapper=$remote_wrapper",
+    "--local_wrapper=$local_wrapper",
+    "--labels=type=compile,compiler=clang,lang=cpp ",
+  ]
   compiler_prefix = string_join(" ", compiler_args)
-  link_prefix = string_join(" ", link_args)
+  link_prefix = ""
 } else if (use_ccache) {
   compiler_prefix = "ccache "
   link_prefix = "ccache "