diff options
| author | 2021-03-12 17:56:51 -0800 | |
|---|---|---|
| committer | 2021-03-18 16:17:34 -0700 | |
| commit | 1661aff8bea44396b3587e19c8c79fd574bf043d (patch) | |
| tree | c4d9c848db7bb229ec3025b05f68debf1b7956cc /java/droiddoc.go | |
| parent | ef972743e8d4c047bbba7747caf3e90215889eb0 (diff) | |
Run lint actions in sbox
Run lint actions in sbox with RuleBuilder.SandboxInputs. This
copies all input files into the sandbox, which prevents the lint
tool from finding nearby source files that were not presented to it.
Using SandboxInputs requires use of PathForInput or PathForOutput
anywhere a path is used outside of the RuleBuilderCommand methods
that take paths so that they can be translated to the paths that
will be used in the sandbox.
Bug: 181681346
Test: lint_test.go
Test: m lint-check dist
Test: m USE_RBE=true RBE_LINT=true lint-check dist
Test: m USE_RBE=true RBE_LINT=true RBE_LINT_EXEC_STRATEGY=remote lint-check dist
Change-Id: Iab4e09d961891ef182643583d4d456e413bc5e39
Diffstat (limited to 'java/droiddoc.go')
| -rw-r--r-- | java/droiddoc.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index 706111ffd..a892b363e 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -1678,14 +1678,17 @@ func StubsDefaultsFactory() android.Module { func zipSyncCmd(ctx android.ModuleContext, rule *android.RuleBuilder, srcJarDir android.ModuleOutPath, srcJars android.Paths) android.OutputPath { - rule.Command().Text("rm -rf").Text(srcJarDir.String()) - rule.Command().Text("mkdir -p").Text(srcJarDir.String()) + cmd := rule.Command() + cmd.Text("rm -rf").Text(cmd.PathForOutput(srcJarDir)) + cmd = rule.Command() + cmd.Text("mkdir -p").Text(cmd.PathForOutput(srcJarDir)) srcJarList := srcJarDir.Join(ctx, "list") rule.Temporary(srcJarList) - rule.Command().BuiltTool("zipsync"). - FlagWithArg("-d ", srcJarDir.String()). + cmd = rule.Command() + cmd.BuiltTool("zipsync"). + FlagWithArg("-d ", cmd.PathForOutput(srcJarDir)). FlagWithOutput("-l ", srcJarList). FlagWithArg("-f ", `"*.java"`). Inputs(srcJars) |