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

Merge "Refactor the genrule allowlists code to support internal allowlists"

Browse Source
This commit is contained in:
Yu Liu
2023-06-01 02:50:41 +00:00
committed by Gerrit Code Review
parent ef17be26a8 45d6af544a
commit b2cd6f6963
2 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
genrule/allowlists.go
View File

@@ -14,10 +14,6 @@
package genrule
import (
"android/soong/android"
)
var (
DepfileAllowList = []string{
"depfile_allowed_for_test",
@@ -136,12 +132,3 @@ var (
"external/perfetto",
}
)
var DepfileAllowSet = map[string]bool{}
var SandboxingDenyModuleSet = map[string]bool{}
var SandboxingDenyPathSet = map[string]bool{}
func init() {
android.AddToStringSet(DepfileAllowSet, DepfileAllowList)
android.AddToStringSet(SandboxingDenyModuleSet, append(DepfileAllowList, SandboxingDenyModuleList...))
android.AddToStringSet(SandboxingDenyPathSet, SandboxingDenyPathList)
}

28
genrule/genrule.go
View File

@@ -24,6 +24,7 @@ import (
"path/filepath"
"strconv"
"strings"
"sync"
"android/soong/bazel/cquery"
@@ -60,6 +61,12 @@ var PrepareForIntegrationTestWithGenrule = android.GroupFixturePreparers(
PrepareForTestWithGenRuleBuildComponents,
)
var DepfileAllowSet map[string]bool
var SandboxingDenyModuleSet map[string]bool
var SandboxingDenyPathSet map[string]bool
var SandboxingDenyModuleSetLock sync.Mutex
var DepfileAllowSetLock sync.Mutex
func RegisterGenruleBuildComponents(ctx android.RegistrationContext) {
ctx.RegisterModuleType("genrule_defaults", defaultsFactory)
@@ -595,6 +602,12 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// Allowlist genrule to use depfile until we have a solution to remove it.
// TODO(b/235582219): Remove allowlist for genrule
if Bool(g.properties.Depfile) {
if DepfileAllowSet == nil {
DepfileAllowSetLock.Lock()
defer DepfileAllowSetLock.Unlock()
DepfileAllowSet = map[string]bool{}
android.AddToStringSet(DepfileAllowSet, DepfileAllowList)
}
// TODO(b/283852474): Checking the GenruleSandboxing flag is temporary in
// order to pass the presubmit before internal master is updated.
if ctx.DeviceConfig().GenruleSandboxing() && !DepfileAllowSet[g.Name()] {
@@ -1024,8 +1037,19 @@ func DefaultsFactory(props ...interface{}) android.Module {
}
func getSandboxedRuleBuilder(ctx android.ModuleContext, r *android.RuleBuilder) *android.RuleBuilder {
if !ctx.DeviceConfig().GenruleSandboxing() || SandboxingDenyPathSet[ctx.ModuleDir()] ||
SandboxingDenyModuleSet[ctx.ModuleName()] {
if !ctx.DeviceConfig().GenruleSandboxing() {
return r.SandboxTools()
}
if SandboxingDenyModuleSet == nil {
SandboxingDenyModuleSetLock.Lock()
defer SandboxingDenyModuleSetLock.Unlock()
SandboxingDenyModuleSet = map[string]bool{}
SandboxingDenyPathSet = map[string]bool{}
android.AddToStringSet(SandboxingDenyModuleSet, append(DepfileAllowList, SandboxingDenyModuleList...))
android.AddToStringSet(SandboxingDenyPathSet, SandboxingDenyPathList)
}
if SandboxingDenyPathSet[ctx.ModuleDir()] || SandboxingDenyModuleSet[ctx.ModuleName()] {
return r.SandboxTools()
}
return r.SandboxInputs()