From f1a035e6be35d5678ce2e86bf3bc83fd5e4b4dc2 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 16 Nov 2020 17:32:30 -0800 Subject: Pass pctx and ctx to NewRuleBuilder Enable the RuleBuilder and RuleBuilderCommand methods to access the BuilderContext by passing it to NewRuleBuilder instead of RuleBuilder.Build. Test: genrule_test.go Test: rule_builder_test.go Test: m checkbuild Change-Id: I63e6597e19167393876dc2259d6f521363b7dabc --- java/hiddenapi.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'java/hiddenapi.go') diff --git a/java/hiddenapi.go b/java/hiddenapi.go index 63b801a5c..71f1e576d 100644 --- a/java/hiddenapi.go +++ b/java/hiddenapi.go @@ -135,12 +135,12 @@ func (h *hiddenAPI) hiddenAPIGenerateCSV(ctx android.ModuleContext, flagsCSV, me }) h.metadataCSVPath = metadataCSV - rule := android.NewRuleBuilder() + rule := android.NewRuleBuilder(pctx, ctx) rule.Command(). - BuiltTool(ctx, "merge_csv"). + BuiltTool("merge_csv"). FlagWithInput("--zip_input=", classesJar). FlagWithOutput("--output=", indexCSV) - rule.Build(pctx, ctx, "merged-hiddenapi-index", "Merged Hidden API index") + rule.Build("merged-hiddenapi-index", "Merged Hidden API index") h.indexCSVPath = indexCSV } -- cgit v1.2.3-59-g8ed1b