StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2024-06-26 20:25:07 +00:00
committed by Gerrit Code Review
parent e5ef3e0ba0 fddc3dc8d3
commit 38a97b2c47
3 changed files with 3 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ui/build/config.go
View File

@@ -99,10 +99,9 @@ type configImpl struct {
// Autodetected // Autodetected
totalRAM uint64 totalRAM uint64
brokenDupRules bool brokenDupRules bool
brokenUsesNetwork bool brokenUsesNetwork bool
brokenNinjaEnvVars []string brokenNinjaEnvVars []string
brokenMissingOutputs bool
pathReplaced bool pathReplaced bool
@@ -1609,14 +1608,6 @@ func (c *configImpl) BuildBrokenNinjaUsesEnvVars() []string {
return c.brokenNinjaEnvVars 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) { func (c *configImpl) SetTargetDeviceDir(dir string) {
c.targetDeviceDir = dir c.targetDeviceDir = dir
} }

6
ui/build/dumpvars.go
View File

@@ -235,11 +235,6 @@ func runMakeProductConfig(ctx Context, config Config) {
"BUILD_BROKEN_SRC_DIR_IS_WRITABLE", "BUILD_BROKEN_SRC_DIR_IS_WRITABLE",
"BUILD_BROKEN_SRC_DIR_RW_ALLOWLIST", "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 // Not used, but useful to be in the soong.log
"TARGET_BUILD_TYPE", "TARGET_BUILD_TYPE",
"HOST_ARCH", "HOST_ARCH",
@@ -306,5 +301,4 @@ func runMakeProductConfig(ctx Context, config Config) {
config.SetBuildBrokenUsesNetwork(makeVars["BUILD_BROKEN_USES_NETWORK"] == "true") config.SetBuildBrokenUsesNetwork(makeVars["BUILD_BROKEN_USES_NETWORK"] == "true")
config.SetBuildBrokenNinjaUsesEnvVars(strings.Fields(makeVars["BUILD_BROKEN_NINJA_USES_ENV_VARS"])) config.SetBuildBrokenNinjaUsesEnvVars(strings.Fields(makeVars["BUILD_BROKEN_NINJA_USES_ENV_VARS"]))
config.SetSourceRootDirs(strings.Fields(makeVars["PRODUCT_SOURCE_ROOT_DIRS"])) config.SetSourceRootDirs(strings.Fields(makeVars["PRODUCT_SOURCE_ROOT_DIRS"]))
config.SetBuildBrokenMissingOutputs(makeVars["BUILD_BROKEN_MISSING_OUTPUTS"] == "true")
} }

8
ui/build/ninja.go
View File

@@ -77,14 +77,6 @@ func runNinjaForBuild(ctx Context, config Config) {
"-w", "dupbuild=err", "-w", "dupbuild=err",
"-w", "missingdepfile=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...) cmd := Command(ctx, config, "ninja", executable, args...)
// Set up the nsjail sandbox Ninja runs in. // Set up the nsjail sandbox Ninja runs in.