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

Commit 7f4242f0 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Disable Soong tests by default on Linux" into main am: c2d3ffca am:... 

Merge "Disable Soong tests by default on Linux" into main am: c2d3ffca am: 0d7e5708 am: f3b40d99

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



Change-Id: Ic90f1f777fc6c0b7e020a97c2f7b26b955f184e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0ad7c65b f3b40d99

ui/build/config.go

+7 −0
Original line number Diff line number Diff line
@@ -240,6 +240,11 @@ func NewConfig(ctx Context, args ...string) Config { 
		ninjaWeightListSource: DEFAULT,

	}



	// Skip soong tests by default on Linux

	if runtime.GOOS == "linux" {

		ret.skipSoongTests = true

	}



	// Default matching ninja

	ret.parallel = runtime.NumCPU() + 2

	ret.keepGoing = 1
@@ -772,6 +777,8 @@ func (c *configImpl) parseArgs(ctx Context, args []string) { 
			c.skipConfig = true

		} else if arg == "--skip-soong-tests" {

			c.skipSoongTests = true

		} else if arg == "--no-skip-soong-tests" {

			c.skipSoongTests = false

		} else if arg == "--skip-metrics-upload" {

			c.skipMetricsUpload = true

		} else if arg == "--mk-metrics" {