tequilaOS/platform_system_sepolicy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Follow argument changes to RuleBuilder

Browse source 
Pass pctx and ctx to NewRuleBuilder instead of RuleBuilder.Build,
and don't pass ctx to RuleBuilderCommand.BuiltTool.  Follows the
changes in I63e6597e19167393876dc2259d6f521363b7dabc.

Test: m checkbuild
Change-Id: I372e8ecc3c4ea7ca8f66a8e1054eddd1a9af9dbd
This commit is contained in:
Colin Cross 2020-11-16 17:58:17 -08:00
parent 476ef10ed8
commit 242c8bc876
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
build/soong/selinux_contexts.go
View file

@ -279,7 +279,7 @@ func selinuxContextsMutator(ctx android.BottomUpMutatorContext) {
func (m *selinuxContextsModule) buildGeneralContexts(ctx android.ModuleContext, inputs android.Paths) android.Path { func (m *selinuxContextsModule) buildGeneralContexts(ctx android.ModuleContext, inputs android.Paths) android.Path {
ret := android.PathForModuleGen(ctx, ctx.ModuleName()+"_m4out") ret := android.PathForModuleGen(ctx, ctx.ModuleName()+"_m4out")
rule := android.NewRuleBuilder() rule := android.NewRuleBuilder(pctx, ctx)
rule.Command(). rule.Command().
Tool(ctx.Config().PrebuiltBuildTool(ctx, "m4")). Tool(ctx.Config().PrebuiltBuildTool(ctx, "m4")).
@ -314,7 +314,7 @@ func (m *selinuxContextsModule) buildGeneralContexts(ctx android.ModuleContext,
ret = sorted_output ret = sorted_output
} }
rule.Build(pctx, ctx, "selinux_contexts", "building contexts: "+m.Name()) rule.Build("selinux_contexts", "building contexts: "+m.Name())
rule.DeleteTemporaryFiles() rule.DeleteTemporaryFiles()
@ -326,7 +326,7 @@ func (m *selinuxContextsModule) buildFileContexts(ctx android.ModuleContext, inp
m.properties.Fc_sort = proptools.BoolPtr(true) m.properties.Fc_sort = proptools.BoolPtr(true)
} }
rule := android.NewRuleBuilder() rule := android.NewRuleBuilder(pctx, ctx)
if ctx.Config().FlattenApex() { if ctx.Config().FlattenApex() {
for _, src := range m.fileContextsProperties.Flatten_apex.Srcs { for _, src := range m.fileContextsProperties.Flatten_apex.Srcs {
@ -351,7 +351,7 @@ func (m *selinuxContextsModule) buildFileContexts(ctx android.ModuleContext, inp
} }
} }
rule.Build(pctx, ctx, m.Name(), "flattened_apex_file_contexts") rule.Build(m.Name(), "flattened_apex_file_contexts")
return m.buildGeneralContexts(ctx, inputs) return m.buildGeneralContexts(ctx, inputs)
} }
@ -385,7 +385,7 @@ func (m *selinuxContextsModule) buildPropertyContexts(ctx android.ModuleContext,
// check compatibility with sysprop_library // check compatibility with sysprop_library
if len(apiFiles) > 0 { if len(apiFiles) > 0 {
out := android.PathForModuleGen(ctx, ctx.ModuleName()+"_api_checked") out := android.PathForModuleGen(ctx, ctx.ModuleName()+"_api_checked")
rule := android.NewRuleBuilder() rule := android.NewRuleBuilder(pctx, ctx)
msg := `\n******************************\n` + msg := `\n******************************\n` +
`API of sysprop_library doesn't match with property_contexts\n` + `API of sysprop_library doesn't match with property_contexts\n` +
@ -394,7 +394,7 @@ func (m *selinuxContextsModule) buildPropertyContexts(ctx android.ModuleContext,
rule.Command(). rule.Command().
Text("( "). Text("( ").
BuiltTool(ctx, "sysprop_type_checker"). BuiltTool("sysprop_type_checker").
FlagForEachInput("--api ", apiFiles). FlagForEachInput("--api ", apiFiles).
FlagWithInput("--context ", builtCtxFile). FlagWithInput("--context ", builtCtxFile).
Text(" || ( echo").Flag("-e"). Text(" || ( echo").Flag("-e").
@ -402,7 +402,7 @@ func (m *selinuxContextsModule) buildPropertyContexts(ctx android.ModuleContext,
Text("; exit 38) )") Text("; exit 38) )")
rule.Command().Text("cp -f").Input(builtCtxFile).Output(out) rule.Command().Text("cp -f").Input(builtCtxFile).Output(out)
rule.Build(pctx, ctx, "property_contexts_check_api", "checking API: "+m.Name()) rule.Build("property_contexts_check_api", "checking API: "+m.Name())
builtCtxFile = out builtCtxFile = out
} }