Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca53ed39 authored by David Srbecky's avatar David Srbecky Committed by Gerrit Code Review
Browse files

Merge "Export default RBE_platform"

parents c7ceb431 2285cfff

ui/build/Android.bp

+4 −3
Original line number Original line Diff line number Diff line
@@ -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",

ui/build/rbe.go

+6 −4
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ import ( 
	"runtime"

	"runtime"

	"strings"

	"strings"





	"android/soong/remoteexec"

	"android/soong/ui/metrics"

	"android/soong/ui/metrics"

)

)
@@ -59,6 +60,7 @@ func getRBEVars(ctx Context, config Config) map[string]string { 
		"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()))