Merge "Revert "Enforce that output files are created in primary ninja execution"" into main
diff --git a/ui/build/config.go b/ui/build/config.go
index 1d5269c..c4a6797 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -99,10 +99,9 @@
// Autodetected
totalRAM uint64
- brokenDupRules bool
- brokenUsesNetwork bool
- brokenNinjaEnvVars []string
- brokenMissingOutputs bool
+ brokenDupRules bool
+ brokenUsesNetwork bool
+ brokenNinjaEnvVars []string
pathReplaced bool
@@ -1609,14 +1608,6 @@
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
}
diff --git a/ui/build/dumpvars.go b/ui/build/dumpvars.go
index e77df44..eba86a0 100644
--- a/ui/build/dumpvars.go
+++ b/ui/build/dumpvars.go
@@ -235,11 +235,6 @@
"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 @@
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")
}
diff --git a/ui/build/ninja.go b/ui/build/ninja.go
index ae27330..551b8ab 100644
--- a/ui/build/ninja.go
+++ b/ui/build/ninja.go
@@ -77,14 +77,6 @@
"-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.