diff options
| author | 2023-10-20 14:41:18 +0000 | |
|---|---|---|
| committer | 2023-10-20 14:41:18 +0000 | |
| commit | f76b3267d52aa90f99ba6b75d33a8231a1db9e58 (patch) | |
| tree | 9a20f779ca5690537a3e5d2fa7295611582aecab /java | |
| parent | b60cd11bc7e4ebb55ddb8101e309052166da8011 (diff) | |
| parent | 9c4936405ed2aba6b2ecdb78b168a8a478686b20 (diff) | |
Merge "support toggling compare mode for rbe actions" into main
Diffstat (limited to 'java')
| -rw-r--r-- | java/droidstubs.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/droidstubs.go b/java/droidstubs.go index 8039d0515..a7e8eb659 100644 --- a/java/droidstubs.go +++ b/java/droidstubs.go @@ -19,6 +19,7 @@ import ( "path/filepath" "regexp" "sort" + "strconv" "strings" "github.com/google/blueprint/proptools" @@ -497,6 +498,7 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi if metalavaUseRbe(ctx) { rule.Remoteable(android.RemoteRuleSupports{RBE: true}) execStrategy := ctx.Config().GetenvWithDefault("RBE_METALAVA_EXEC_STRATEGY", remoteexec.LocalExecStrategy) + compare, _ := strconv.ParseBool(ctx.Config().GetenvWithDefault("RBE_METALAVA_COMPARE", "false")) labels := map[string]string{"type": "tool", "name": "metalava"} // TODO: metalava pool rejects these jobs pool := ctx.Config().GetenvWithDefault("RBE_METALAVA_POOL", "java16") @@ -505,6 +507,9 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi ExecStrategy: execStrategy, ToolchainInputs: []string{config.JavaCmd(ctx).String()}, Platform: map[string]string{remoteexec.PoolKey: pool}, + Compare: compare, + NumLocalRuns: 1, + NumRemoteRuns: 1, }) } |