From e762b94fe7eb1666ac57a3452ac3d78ed4e155b9 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Fri, 15 Mar 2024 12:46:14 -0700 Subject: [PATCH] Remove SandboxingDenyPathList It's no longer used. Bug: 307824623 Test: m nothing --no-skip-soong-tests Change-Id: I181de9d852f4025c6c5829cc4941ffb705f7cb50 --- genrule/allowlists.go | 5 ----- genrule/genrule.go | 7 +------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/genrule/allowlists.go b/genrule/allowlists.go index 60b1366d0..7c71b77ef 100644 --- a/genrule/allowlists.go +++ b/genrule/allowlists.go @@ -21,9 +21,4 @@ var ( "com.google.pixel.camera.hal.manifest", // go/keep-sorted end } - - SandboxingDenyPathList = []string{ - // go/keep-sorted start - // go/keep-sorted end - } ) diff --git a/genrule/genrule.go b/genrule/genrule.go index 6f6608817..a2a3f7584 100644 --- a/genrule/genrule.go +++ b/genrule/genrule.go @@ -842,19 +842,15 @@ var sandboxingAllowlistKey = android.NewOnceKey("genruleSandboxingAllowlistKey") type sandboxingAllowlistSets struct { sandboxingDenyModuleSet map[string]bool - sandboxingDenyPathSet map[string]bool } func getSandboxingAllowlistSets(ctx android.PathContext) *sandboxingAllowlistSets { return ctx.Config().Once(sandboxingAllowlistKey, func() interface{} { sandboxingDenyModuleSet := map[string]bool{} - sandboxingDenyPathSet := map[string]bool{} android.AddToStringSet(sandboxingDenyModuleSet, SandboxingDenyModuleList) - android.AddToStringSet(sandboxingDenyPathSet, SandboxingDenyPathList) return &sandboxingAllowlistSets{ sandboxingDenyModuleSet: sandboxingDenyModuleSet, - sandboxingDenyPathSet: sandboxingDenyPathSet, } }).(*sandboxingAllowlistSets) } @@ -864,8 +860,7 @@ func getSandboxedRuleBuilder(ctx android.ModuleContext, r *android.RuleBuilder) return r.SandboxTools() } sandboxingAllowlistSets := getSandboxingAllowlistSets(ctx) - if sandboxingAllowlistSets.sandboxingDenyPathSet[ctx.ModuleDir()] || - sandboxingAllowlistSets.sandboxingDenyModuleSet[ctx.ModuleName()] { + if sandboxingAllowlistSets.sandboxingDenyModuleSet[ctx.ModuleName()] { return r.SandboxTools() } return r.SandboxInputs()