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

Commit 3cc89331 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix RBE tmp dir" into main

parents 6524e1d5 d4da266b

ui/build/config.go

+1 −2
Original line number Diff line number Diff line
@@ -1341,8 +1341,7 @@ func (c *configImpl) rbeDownloadTmpDir() string { 
}



func (c *configImpl) rbeTmpDir() string {

	buildTmpDir := shared.TempDirForOutDir(c.SoongOutDir())

	return filepath.Join(buildTmpDir, "rbe")

	return filepath.Join(c.SoongOutDir(), "rbe")

}



func (c *configImpl) rbeCacheDir() string {

ui/build/rbe.go

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ func getRBEVars(ctx Context, config Config) map[string]string { 
		"RBE_platform":         "container-image=" + remoteexec.DefaultImage,

	}

	if config.StartRBE() {

		name, err := config.rbeSockAddr(absPath(ctx, config.TempDir()))

		name, err := config.rbeSockAddr(absPath(ctx, config.rbeTmpDir()))

		if err != nil {

			ctx.Fatalf("Error retrieving socket address: %v", err)

			return nil