diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/droidstubs.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/java/droidstubs.go b/java/droidstubs.go index 2921c3e82..c5b56f76d 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -433,6 +433,10 @@ func (d *Droidstubs) apiLevelsAnnotationsFlags(ctx android.ModuleContext, cmd *a } } +func metalavaUseRbe(ctx android.ModuleContext) bool { + return ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_METALAVA") +} + func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersion javaVersion, srcs android.Paths, srcJarList android.Path, bootclasspath, classpath classpath, homeDir android.WritablePath) *android.RuleBuilderCommand { rule.Command().Text("rm -rf").Flag(homeDir.String()) @@ -441,7 +445,7 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi cmd := rule.Command() cmd.FlagWithArg("ANDROID_PREFS_ROOT=", homeDir.String()) - if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_METALAVA") { + if metalavaUseRbe(ctx) { rule.Remoteable(android.RemoteRuleSupports{RBE: true}) execStrategy := ctx.Config().GetenvWithDefault("RBE_METALAVA_EXEC_STRATEGY", remoteexec.LocalExecStrategy) labels := map[string]string{"type": "tool", "name": "metalava"} @@ -665,7 +669,9 @@ func (d *Droidstubs) GenerateAndroidBuildActions(ctx android.ModuleContext) { } // TODO(b/183630617): rewrapper doesn't support restat rules - // rule.Restat() + if !metalavaUseRbe(ctx) { + rule.Restat() + } zipSyncCleanupCmd(rule, srcJarDir) |