Add BUILD_BROKEN_USES_NETWORK
Some people apparently still talk to the network during their build. Allow this temporarily with a BUILD_BROKEN_USES_NETWORK check. Bug: 129992021 Test: attempt to talk to the network during the build with and without this flag. Change-Id: Ifb967c656aa24c4599e7232d0f1b5a303b5bac52
This commit is contained in:
@@ -90,6 +90,10 @@ var buildBrokenSettings = []struct {
|
|||||||
"Changes.md#LOCAL_MODULE_TAGS",
|
"Changes.md#LOCAL_MODULE_TAGS",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "BUILD_BROKEN_USES_NETWORK",
|
||||||
|
behavior: DefaultDeprecated,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProductBranch struct {
|
type ProductBranch struct {
|
||||||
|
@@ -55,6 +55,7 @@ type configImpl struct {
|
|||||||
|
|
||||||
brokenDupRules bool
|
brokenDupRules bool
|
||||||
brokenPhonyTargets bool
|
brokenPhonyTargets bool
|
||||||
|
brokenUsesNetwork bool
|
||||||
|
|
||||||
pathReplaced bool
|
pathReplaced bool
|
||||||
}
|
}
|
||||||
@@ -622,6 +623,14 @@ func (c *configImpl) BuildBrokenPhonyTargets() bool {
|
|||||||
return c.brokenPhonyTargets
|
return c.brokenPhonyTargets
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *configImpl) SetBuildBrokenUsesNetwork(val bool) {
|
||||||
|
c.brokenUsesNetwork = val
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *configImpl) BuildBrokenUsesNetwork() bool {
|
||||||
|
return c.brokenUsesNetwork
|
||||||
|
}
|
||||||
|
|
||||||
func (c *configImpl) SetTargetDeviceDir(dir string) {
|
func (c *configImpl) SetTargetDeviceDir(dir string) {
|
||||||
c.targetDeviceDir = dir
|
c.targetDeviceDir = dir
|
||||||
}
|
}
|
||||||
|
@@ -203,6 +203,9 @@ func runMakeProductConfig(ctx Context, config Config) {
|
|||||||
// Used to turn on --werror_ options in Kati
|
// Used to turn on --werror_ options in Kati
|
||||||
"BUILD_BROKEN_PHONY_TARGETS",
|
"BUILD_BROKEN_PHONY_TARGETS",
|
||||||
|
|
||||||
|
// Whether to enable the network during the build
|
||||||
|
"BUILD_BROKEN_USES_NETWORK",
|
||||||
|
|
||||||
// Not used, but useful to be in the soong.log
|
// Not used, but useful to be in the soong.log
|
||||||
"BOARD_VNDK_VERSION",
|
"BOARD_VNDK_VERSION",
|
||||||
"BUILD_BROKEN_ANDROIDMK_EXPORTS",
|
"BUILD_BROKEN_ANDROIDMK_EXPORTS",
|
||||||
@@ -238,4 +241,5 @@ func runMakeProductConfig(ctx Context, config Config) {
|
|||||||
config.SetPdkBuild(make_vars["TARGET_BUILD_PDK"] == "true")
|
config.SetPdkBuild(make_vars["TARGET_BUILD_PDK"] == "true")
|
||||||
config.SetBuildBrokenDupRules(make_vars["BUILD_BROKEN_DUP_RULES"] == "true")
|
config.SetBuildBrokenDupRules(make_vars["BUILD_BROKEN_DUP_RULES"] == "true")
|
||||||
config.SetBuildBrokenPhonyTargets(make_vars["BUILD_BROKEN_PHONY_TARGETS"] == "true")
|
config.SetBuildBrokenPhonyTargets(make_vars["BUILD_BROKEN_PHONY_TARGETS"] == "true")
|
||||||
|
config.SetBuildBrokenUsesNetwork(make_vars["BUILD_BROKEN_USES_NETWORK"] == "true")
|
||||||
}
|
}
|
||||||
|
@@ -26,6 +26,8 @@ import (
|
|||||||
type Sandbox struct {
|
type Sandbox struct {
|
||||||
Enabled bool
|
Enabled bool
|
||||||
DisableWhenUsingGoma bool
|
DisableWhenUsingGoma bool
|
||||||
|
|
||||||
|
AllowBuildBrokenUsesNetwork bool
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -40,6 +42,8 @@ var (
|
|||||||
ninjaSandbox = Sandbox{
|
ninjaSandbox = Sandbox{
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
DisableWhenUsingGoma: true,
|
DisableWhenUsingGoma: true,
|
||||||
|
|
||||||
|
AllowBuildBrokenUsesNetwork: true,
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -152,10 +156,17 @@ func (c *Cmd) wrapSandbox() {
|
|||||||
|
|
||||||
// Only log important warnings / errors
|
// Only log important warnings / errors
|
||||||
"-q",
|
"-q",
|
||||||
|
|
||||||
// Stop parsing arguments
|
|
||||||
"--",
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if c.Sandbox.AllowBuildBrokenUsesNetwork && c.config.BuildBrokenUsesNetwork() {
|
||||||
|
c.ctx.Printf("AllowBuildBrokenUsesNetwork: %v", c.Sandbox.AllowBuildBrokenUsesNetwork)
|
||||||
|
c.ctx.Printf("BuildBrokenUsesNetwork: %v", c.config.BuildBrokenUsesNetwork())
|
||||||
|
sandboxArgs = append(sandboxArgs, "-N")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stop nsjail from parsing arguments
|
||||||
|
sandboxArgs = append(sandboxArgs, "--")
|
||||||
|
|
||||||
c.Args = append(sandboxArgs, c.Args[1:]...)
|
c.Args = append(sandboxArgs, c.Args[1:]...)
|
||||||
c.Path = nsjailPath
|
c.Path = nsjailPath
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user