StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "allow specifying remote caching opt for rewrapper" into main

Browse Source
This commit is contained in:
Anas Sulaiman
2023-11-29 16:36:21 +00:00
committed by Gerrit Code Review
parent 0fd71d0232 9d7a36d17f
commit 80117e6c4f
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/droidstubs.go
View File

@@ -19,7 +19,6 @@ import (
"path/filepath" "path/filepath"
"regexp" "regexp"
"sort" "sort"
"strconv"
"strings" "strings"
"github.com/google/blueprint/proptools" "github.com/google/blueprint/proptools"
@@ -500,18 +499,20 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
if metalavaUseRbe(ctx) { if metalavaUseRbe(ctx) {
rule.Remoteable(android.RemoteRuleSupports{RBE: true}) rule.Remoteable(android.RemoteRuleSupports{RBE: true})
execStrategy := ctx.Config().GetenvWithDefault("RBE_METALAVA_EXEC_STRATEGY", remoteexec.LocalExecStrategy) execStrategy := ctx.Config().GetenvWithDefault("RBE_METALAVA_EXEC_STRATEGY", remoteexec.LocalExecStrategy)
compare, _ := strconv.ParseBool(ctx.Config().GetenvWithDefault("RBE_METALAVA_COMPARE", "false")) compare := ctx.Config().IsEnvTrue("RBE_METALAVA_COMPARE")
remoteUpdateCache := !ctx.Config().IsEnvFalse("RBE_METALAVA_REMOTE_UPDATE_CACHE")
labels := map[string]string{"type": "tool", "name": "metalava"} labels := map[string]string{"type": "tool", "name": "metalava"}
// TODO: metalava pool rejects these jobs // TODO: metalava pool rejects these jobs
pool := ctx.Config().GetenvWithDefault("RBE_METALAVA_POOL", "java16") pool := ctx.Config().GetenvWithDefault("RBE_METALAVA_POOL", "java16")
rule.Rewrapper(&remoteexec.REParams{ rule.Rewrapper(&remoteexec.REParams{
Labels: labels, Labels: labels,
ExecStrategy: execStrategy, ExecStrategy: execStrategy,
ToolchainInputs: []string{config.JavaCmd(ctx).String()}, ToolchainInputs: []string{config.JavaCmd(ctx).String()},
Platform: map[string]string{remoteexec.PoolKey: pool}, Platform: map[string]string{remoteexec.PoolKey: pool},
Compare: compare, Compare: compare,
NumLocalRuns: 1, NumLocalRuns: 1,
NumRemoteRuns: 1, NumRemoteRuns: 1,
NoRemoteUpdateCache: !remoteUpdateCache,
}) })
} }

6
remoteexec/remoteexec.go
View File

@@ -91,6 +91,8 @@ type REParams struct {
NumLocalRuns int NumLocalRuns int
// Number of times the action should be rerun remotely. // Number of times the action should be rerun remotely.
NumRemoteRuns int NumRemoteRuns int
// Boolean indicating whether to update remote cache entry. Rewrapper defaults to true, so the name is negated here.
NoRemoteUpdateCache bool
} }
func init() { func init() {
@@ -146,6 +148,10 @@ func (r *REParams) wrapperArgs() string {
args += fmt.Sprintf(" --compare=true --num_local_reruns=%d --num_remote_reruns=%d", r.NumLocalRuns, r.NumRemoteRuns) args += fmt.Sprintf(" --compare=true --num_local_reruns=%d --num_remote_reruns=%d", r.NumLocalRuns, r.NumRemoteRuns)
} }
if r.NoRemoteUpdateCache {
args += " --remote_update_cache=false"
}
if len(r.Inputs) > 0 { if len(r.Inputs) > 0 {
args += " --inputs=" + strings.Join(r.Inputs, ",") args += " --inputs=" + strings.Join(r.Inputs, ",")
} }