From 2a16784938d3be059014d4112f00ac70a386fa0c Mon Sep 17 00:00:00 2001 From: Zachary Anderson Date: Tue, 26 Mar 2024 15:34:39 +0000 Subject: [PATCH] Shift RBE remote wrapper flag from config file to command line flag (#841) The relative path in the config file is incorrect if the working directory is not directly nested under `out/`, as will happen with https://github.com/flutter/engine/pull/51474. --- build/toolchain/mac/BUILD.gn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn index f573fe7209..e6d30a1f78 100644 --- a/build/toolchain/mac/BUILD.gn +++ b/build/toolchain/mac/BUILD.gn @@ -28,12 +28,12 @@ if (use_goma) { objc_prefix = "$goma_dir/gomacc " link_prefix = "$goma_dir/gomacc " } else if (use_rbe) { + remote_wrapper = + rebase_path("//flutter/build/rbe/remote_wrapper.sh", root_build_dir) compiler_args = rewrapper_command + [ + "--remote_wrapper=$remote_wrapper", "--labels=type=compile,compiler=clang,lang=cpp ", ] - link_args = rewrapper_command + [ - "--labels=type=link,tool=clang ", - ] cxx_prefix = string_join(" ", compiler_args) # RBE does not support objc out of the box. objc_prefix = ""