From 40c9513f7fd5c0514d59d3c45fc2c57d7e6ca104 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 16 Nov 2020 17:58:17 -0800 Subject: [PATCH] Follow argument changes to RuleBuilder 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: I5d11e07ae1a24a967e379c151f4f5d7d188c6cc0 --- tools/fs_config/fs_config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/fs_config/fs_config.go b/tools/fs_config/fs_config.go index 16bcefa11b..4c324fb3f9 100644 --- a/tools/fs_config/fs_config.go +++ b/tools/fs_config/fs_config.go @@ -48,10 +48,10 @@ func (t *targetFSConfigGen) GenerateAndroidBuildActions(ctx android.ModuleContex path := android.PathForModuleGen(ctx, "empty") t.paths = android.Paths{path} - rule := android.NewRuleBuilder() + rule := android.NewRuleBuilder(pctx, ctx) rule.Command().Text("rm -rf").Output(path) rule.Command().Text("touch").Output(path) - rule.Build(pctx, ctx, "fs_config_empty", "create empty file") + rule.Build("fs_config_empty", "create empty file") } }