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

Commit fddc3dc8 authored by Santiago Aboy Solanes's avatar Santiago Aboy Solanes Committed by Gerrit Code Review
Browse files

Revert "Enforce that output files are created in primary ninja execution" 

This reverts commit 8d8253f5.

Reason for revert: Breaks ART gtests e.g. https://android-build.corp.google.com/build_explorer/build_details/12016159/art-gtest/

Change-Id: Ie8e1a28c7d0a21ee6727954127a6ab00ed00e781
parent 8d8253f5

ui/build/config.go

+3 −12
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ type configImpl struct { 
	brokenDupRules     bool

	brokenUsesNetwork  bool

	brokenNinjaEnvVars []string

	brokenMissingOutputs bool



	pathReplaced bool
@@ -1592,14 +1591,6 @@ func (c *configImpl) BuildBrokenNinjaUsesEnvVars() []string { 
	return c.brokenNinjaEnvVars

}



func (c *configImpl) SetBuildBrokenMissingOutputs(val bool) {

	c.brokenMissingOutputs = val

}



func (c *configImpl) BuildBrokenMissingOutputs() bool {

	return c.brokenMissingOutputs

}



func (c *configImpl) SetTargetDeviceDir(dir string) {

	c.targetDeviceDir = dir

}

ui/build/dumpvars.go

+0 −6
Original line number Diff line number Diff line
@@ -235,11 +235,6 @@ func runMakeProductConfig(ctx Context, config Config) { 
		"BUILD_BROKEN_SRC_DIR_IS_WRITABLE",

		"BUILD_BROKEN_SRC_DIR_RW_ALLOWLIST",



		// Whether missing outputs should be treated as warnings

		// instead of errors.

		// `true` will relegate missing outputs to warnings.

		"BUILD_BROKEN_MISSING_OUTPUTS",



		// Not used, but useful to be in the soong.log

		"TARGET_BUILD_TYPE",

		"HOST_ARCH",
@@ -306,5 +301,4 @@ func runMakeProductConfig(ctx Context, config Config) { 
	config.SetBuildBrokenUsesNetwork(makeVars["BUILD_BROKEN_USES_NETWORK"] == "true")

	config.SetBuildBrokenNinjaUsesEnvVars(strings.Fields(makeVars["BUILD_BROKEN_NINJA_USES_ENV_VARS"]))

	config.SetSourceRootDirs(strings.Fields(makeVars["PRODUCT_SOURCE_ROOT_DIRS"]))

	config.SetBuildBrokenMissingOutputs(makeVars["BUILD_BROKEN_MISSING_OUTPUTS"] == "true")

}

ui/build/ninja.go

+0 −8
Original line number Diff line number Diff line
@@ -77,14 +77,6 @@ func runNinjaForBuild(ctx Context, config Config) { 
		"-w", "dupbuild=err",

		"-w", "missingdepfile=err")



	if !config.BuildBrokenMissingOutputs() {

		// Missing outputs will be treated as errors.

		// BUILD_BROKEN_MISSING_OUTPUTS can be used to bypass this check.

		args = append(args,

			"-w", "missingoutfile=err",

		)

	}



	cmd := Command(ctx, config, "ninja", executable, args...)



	// Set up the nsjail sandbox Ninja runs in.