Skip to content

Commit

Permalink
[reclient] Add re client windows configs.
Browse files Browse the repository at this point in the history
This should allow us to build chrome using reclient on windows.

Change-Id: Ie8f1f761ce227b16fbcd87cbb5a52b942dfe2b1f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2732289
Reviewed-by: Dirk Pranke <dpranke@google.com>
Commit-Queue: Rubens Farias <rubensf@google.com>
Cr-Commit-Position: refs/heads/master@{#859553}
  • Loading branch information
rubensf authored and Chromium LUCI CQ committed Mar 3, 2021
1 parent 7d29962 commit 67dc286
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
7 changes: 6 additions & 1 deletion build/toolchain/win/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/win/visual_studio_version.gni")
import("//build/toolchain/cc_wrapper.gni")
import("//build/toolchain/goma.gni")
import("//build/toolchain/rbe.gni")
import("//build/toolchain/toolchain.gni")

# Should only be running on Windows.
Expand All @@ -22,7 +23,11 @@ assert(is_win)
# This tool will is used as a wrapper for various commands below.
tool_wrapper_path = rebase_path("tool_wrapper.py", root_build_dir)

if (use_goma) {
if (use_rbe) {
goma_prefix = ""
rbe_prefix = "${rbe_bin_dir}/rewrapper -cfg=${rbe_cc_cfg_file} -exec_root=${rbe_exec_root} "
clang_prefix = rbe_prefix
} else if (use_goma) {
if (host_os == "win") {
goma_prefix = "$goma_dir/gomacc.exe "
} else {
Expand Down
5 changes: 5 additions & 0 deletions buildtools/reclient_cfgs/rewrapper_windows.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
platform=container-image=docker://gcr.io/goma-rbe-images/chromium_win/remoteexec-platform@sha256:3b5893f5a59316c635b6077c94c5dc518dbe68f51a7e55fe4845809ab7440df3,OSFamily=Windows
server_address=pipe://re-client.ipc
labels=type=compile,compiler=clang-cl,lang=cpp
exec_strategy=remote_local_fallback
inputs=third_party\llvm-build\Release+Asserts

0 comments on commit 67dc286

Please sign in to comment.