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

Commit 68805280 authored by Patrice Arruda's avatar Patrice Arruda
Browse files

resolve merge conflicts of 64d43056 to rvc-dev 

Test: I solemnly swear I tested this conflict resolution.
Bug: b/169423400
Change-Id: I9e4bf3784a1ba5ae49793dbf367347106b997461
Merged-In: I67b229fbf52e913b0c4f5e7932021132ddc0598f
parents f81e0a1e 64d43056

cmd/soong_ui/main.go

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ func main() { 
	rbeMetricsFile := filepath.Join(logsDir, c.logsPrefix+"rbe_metrics.pb")

	soongMetricsFile := filepath.Join(logsDir, c.logsPrefix+"soong_metrics")

	defer build.UploadMetrics(buildCtx, config, c.forceDumbOutput, buildStarted, buildErrorFile, rbeMetricsFile, soongMetricsFile)

	defer build.PrintGomaDeprecation(buildCtx, config)



	os.MkdirAll(logsDir, 0777)

	log.SetOutput(filepath.Join(logsDir, c.logsPrefix+"soong.log"))

ui/build/config.go

+24 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import ( 
	"time"



	"android/soong/shared"



	"github.com/golang/protobuf/proto"



	smpb "android/soong/ui/metrics/metrics_proto"
@@ -185,6 +186,17 @@ func NewConfig(ctx Context, args ...string) Config { 
		"EMPTY_NINJA_FILE",

	)



	if ret.UseGoma() {

		ctx.Println("Goma for Android is being deprecated and replaced with RBE. See go/rbe_for_android for instructions on how to use RBE.")

		ctx.Println()

		ctx.Println("See go/goma_android_exceptions for exceptions.")

		ctx.Fatalln("USE_GOMA flag is no longer supported.")

	}



	if ret.ForceUseGoma() {

		ret.environ.Set("USE_GOMA", "true")

	}



	// Tell python not to spam the source tree with .pyc files.

	ret.environ.Set("PYTHONDONTWRITEBYTECODE", "1")
@@ -780,6 +792,18 @@ func (c *configImpl) TotalRAM() uint64 { 
	return c.totalRAM

}



// ForceUseGoma determines whether we should override Goma deprecation

// and use Goma for the current build or not.

func (c *configImpl) ForceUseGoma() bool {

	if v, ok := c.environ.Get("FORCE_USE_GOMA"); ok {

		v = strings.TrimSpace(v)

		if v != "" && v != "false" {

			return true

		}

	}

	return false

}



func (c *configImpl) UseGoma() bool {

	if v, ok := c.environ.Get("USE_GOMA"); ok {

		v = strings.TrimSpace(v)

ui/build/rbe.go

+0 −10
Original line number Diff line number Diff line
@@ -128,13 +128,3 @@ func DumpRBEMetrics(ctx Context, config Config, filename string) { 
		ctx.Fatalf("failed to copy %q to %q: %v\n", metricsFile, filename, err)

	}

}
 


// PrintGomaDeprecation prints a PSA on the deprecation of Goma if it is set for the build.

func PrintGomaDeprecation(ctx Context, config Config) {

	if config.UseGoma() {

		fmt.Fprintln(ctx.Writer, "")

		fmt.Fprintln(ctx.Writer, "Goma for Android is being deprecated and replaced with RBE.")

		fmt.Fprintln(ctx.Writer, "See go/goma_android_deprecation for more details.")

		fmt.Fprintln(ctx.Writer, "")

	}

}