Merge "Remove SandboxingDenyPathList" into main (718804dd) · Commits · e / os / android_build_soong

genrule/allowlists.go

+0 −5

Original line number	Diff line number	Diff line
		@@ -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
		}
		)

+1 −6

Original line number	Diff line number	Diff line
		@@ -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()