diff options
| author | Colin Cross <ccross@android.com> | 2020-12-03 20:07:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-12-03 20:07:30 +0000 |
| commit | 52ba2dbcac76c78c3abe561a9b1700b8b4e28d5b (patch) | |
| tree | acefc0a5b3f56a038f473dee8dae5b194f0368b0 | |
| parent | d84cb299e6b64b5dd76f48edec59d8fd1dba5502 (diff) | |
| parent | d9281c3bba2884765eb44d12bf55ce59a8436d99 (diff) | |
| download | cuttlefish-52ba2dbcac76c78c3abe561a9b1700b8b4e28d5b.tar.gz | |
Merge "Follow argument changes to RuleBuilder"
| -rw-r--r-- | build/cvd-host-package.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/cvd-host-package.go b/build/cvd-host-package.go index 575155763..b72b1e3d5 100644 --- a/build/cvd-host-package.go +++ b/build/cvd-host-package.go @@ -77,9 +77,9 @@ func (c *cvdHostPackage) GenerateAndroidBuildActions(ctx android.ModuleContext) // Dir where to extract the zip file and construct the final tar.gz from packageDir := android.PathForModuleOut(ctx, ".temp").OutputPath - builder := android.NewRuleBuilder() + builder := android.NewRuleBuilder(pctx, ctx) builder.Command(). - BuiltTool(ctx, "zipsync"). + BuiltTool("zipsync"). FlagWithArg("-d ", packageDir.String()). Input(zipFile) @@ -92,7 +92,7 @@ func (c *cvdHostPackage) GenerateAndroidBuildActions(ctx android.ModuleContext) builder.Command().Text("rm").Flag("-rf").Text(packageDir.String()) - builder.Build(pctx, ctx, "cvd_host_package", fmt.Sprintf("Packaging %s", c.BaseModuleName())) + builder.Build("cvd_host_package", fmt.Sprintf("Packaging %s", c.BaseModuleName())) ctx.InstallFile(android.PathForModuleInstall(ctx), c.BaseModuleName()+".tar.gz", output) } |