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

Merge "Remove SandboxingDenyPathList" into main

Browse Source
This commit is contained in:
Cole Faust
2024-03-15 21:35:36 +00:00
committed by Gerrit Code Review
parent f7db7153a3 e762b94fe7
commit 718804dd84
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
genrule/allowlists.go
View File

@@ -21,9 +21,4 @@ var (
"com.google.pixel.camera.hal.manifest", "com.google.pixel.camera.hal.manifest",
// go/keep-sorted end // go/keep-sorted end
} }
SandboxingDenyPathList = []string{
// go/keep-sorted start
// go/keep-sorted end
}
) )

7
genrule/genrule.go
View File

@@ -842,19 +842,15 @@ var sandboxingAllowlistKey = android.NewOnceKey("genruleSandboxingAllowlistKey")
type sandboxingAllowlistSets struct { type sandboxingAllowlistSets struct {
sandboxingDenyModuleSet map[string]bool sandboxingDenyModuleSet map[string]bool
sandboxingDenyPathSet map[string]bool
} }
func getSandboxingAllowlistSets(ctx android.PathContext) *sandboxingAllowlistSets { func getSandboxingAllowlistSets(ctx android.PathContext) *sandboxingAllowlistSets {
return ctx.Config().Once(sandboxingAllowlistKey, func() interface{} { return ctx.Config().Once(sandboxingAllowlistKey, func() interface{} {
sandboxingDenyModuleSet := map[string]bool{} sandboxingDenyModuleSet := map[string]bool{}
sandboxingDenyPathSet := map[string]bool{}
android.AddToStringSet(sandboxingDenyModuleSet, SandboxingDenyModuleList) android.AddToStringSet(sandboxingDenyModuleSet, SandboxingDenyModuleList)
android.AddToStringSet(sandboxingDenyPathSet, SandboxingDenyPathList)
return &sandboxingAllowlistSets{ return &sandboxingAllowlistSets{
sandboxingDenyModuleSet: sandboxingDenyModuleSet, sandboxingDenyModuleSet: sandboxingDenyModuleSet,
sandboxingDenyPathSet: sandboxingDenyPathSet,
} }
}).(*sandboxingAllowlistSets) }).(*sandboxingAllowlistSets)
} }
@@ -864,8 +860,7 @@ func getSandboxedRuleBuilder(ctx android.ModuleContext, r *android.RuleBuilder)
return r.SandboxTools() return r.SandboxTools()
} }
sandboxingAllowlistSets := getSandboxingAllowlistSets(ctx) sandboxingAllowlistSets := getSandboxingAllowlistSets(ctx)
if sandboxingAllowlistSets.sandboxingDenyPathSet[ctx.ModuleDir()] || if sandboxingAllowlistSets.sandboxingDenyModuleSet[ctx.ModuleName()] {
sandboxingAllowlistSets.sandboxingDenyModuleSet[ctx.ModuleName()] {
return r.SandboxTools() return r.SandboxTools()
} }
return r.SandboxInputs() return r.SandboxInputs()