StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Export default RBE_platform" am: ca53ed396c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2151260

Change-Id: Id8ef5ba4fc42675fb3052fb2bdd3dd2134b853f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Srbecky
2022-07-13 20:19:16 +00:00
committed by Automerger Merge Worker
parent 973b6038d4 ca53ed396c
commit 703d6bc23c
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ui/build/Android.bp
View File

@@ -34,15 +34,16 @@ bootstrap_go_package {
deps: [ deps: [
"blueprint", "blueprint",
"blueprint-bootstrap", "blueprint-bootstrap",
"blueprint-microfactory",
"soong-finder",
"soong-remoteexec",
"soong-shared",
"soong-ui-build-paths", "soong-ui-build-paths",
"soong-ui-logger", "soong-ui-logger",
"soong-ui-metrics", "soong-ui-metrics",
"soong-ui-status", "soong-ui-status",
"soong-ui-terminal", "soong-ui-terminal",
"soong-ui-tracer", "soong-ui-tracer",
"soong-shared",
"soong-finder",
"blueprint-microfactory",
], ],
srcs: [ srcs: [
"bazel.go", "bazel.go",

10
ui/build/rbe.go
View File

@@ -21,6 +21,7 @@ import (
"runtime" "runtime"
"strings" "strings"
"android/soong/remoteexec"
"android/soong/ui/metrics" "android/soong/ui/metrics"
) )
@@ -54,11 +55,12 @@ func rbeCommand(ctx Context, config Config, rbeCmd string) string {
func getRBEVars(ctx Context, config Config) map[string]string { func getRBEVars(ctx Context, config Config) map[string]string {
vars := map[string]string{ vars := map[string]string{
"RBE_log_dir": config.rbeProxyLogsDir(), "RBE_log_dir": config.rbeProxyLogsDir(),
"RBE_re_proxy": config.rbeReproxy(), "RBE_re_proxy": config.rbeReproxy(),
"RBE_exec_root": config.rbeExecRoot(), "RBE_exec_root": config.rbeExecRoot(),
"RBE_output_dir": config.rbeProxyLogsDir(), "RBE_output_dir": config.rbeProxyLogsDir(),
"RBE_proxy_log_dir": config.rbeProxyLogsDir(), "RBE_proxy_log_dir": config.rbeProxyLogsDir(),
"RBE_platform": "container-image=" + remoteexec.DefaultImage,
} }
if config.StartRBE() { if config.StartRBE() {
name, err := config.rbeSockAddr(absPath(ctx, config.TempDir())) name, err := config.rbeSockAddr(absPath(ctx, config.TempDir()))