Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e762b94f authored by Cole Faust's avatar Cole Faust
Browse files

Remove SandboxingDenyPathList 

It's no longer used.

Bug: 307824623
Test: m nothing --no-skip-soong-tests
Change-Id: I181de9d852f4025c6c5829cc4941ffb705f7cb50
parent ed9005b5

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

	}

)

genrule/genrule.go

+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()