Merge "allow specifying remote caching opt for rewrapper" into main (80117e6c) · Commits · e / os / android_build_soong

java/droidstubs.go

+10 −9

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ import (
		"path/filepath"
		"regexp"
		"sort"
		"strconv"
		"strings"

		"github.com/google/blueprint/proptools"
		@@ -500,7 +499,8 @@ 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"))
		compare := ctx.Config().IsEnvTrue("RBE_METALAVA_COMPARE")
		remoteUpdateCache := !ctx.Config().IsEnvFalse("RBE_METALAVA_REMOTE_UPDATE_CACHE")
		labels := map[string]string{"type": "tool", "name": "metalava"}
		// TODO: metalava pool rejects these jobs
		pool := ctx.Config().GetenvWithDefault("RBE_METALAVA_POOL", "java16")
		@@ -512,6 +512,7 @@ func metalavaCmd(ctx android.ModuleContext, rule *android.RuleBuilder, javaVersi
		Compare: compare,
		NumLocalRuns: 1,
		NumRemoteRuns: 1,
		NoRemoteUpdateCache: !remoteUpdateCache,
		})
		}

+6 −0

Original line number	Diff line number	Diff line
		@@ -91,6 +91,8 @@ type REParams struct {
		NumLocalRuns int
		// Number of times the action should be rerun remotely.
		NumRemoteRuns int
		// Boolean indicating whether to update remote cache entry. Rewrapper defaults to true, so the name is negated here.
		NoRemoteUpdateCache bool
		}

		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)
		}

		if r.NoRemoteUpdateCache {
		args += " --remote_update_cache=false"
		}

		if len(r.Inputs) > 0 {
		args += " --inputs=" + strings.Join(r.Inputs, ",")
		}