aboutsummaryrefslogtreecommitdiff
path: root/remoteexec
diff options
context:
space:
mode:
authorRamy Medhat <abdelaal@google.com>2020-04-17 15:03:58 -0400
committerKousik Kumar <kousikk@google.com>2020-04-27 08:13:42 -0700
commit31ec942ff7e2c5fca9c10eaa6c9c3c7bef2e1637 (patch)
tree4ab80d909fac5d21ff703d46f04c860e03477698 /remoteexec
parent383683559c4ce7c80daee32122e873f60a48a69d (diff)
downloadsoong-31ec942ff7e2c5fca9c10eaa6c9c3c7bef2e1637.tar.gz
Add support for remotely executing header-abi-dumper actions.
Test: built with and without RBE_ABI_DUMPER set. Change-Id: Ie752c07325453076d191813eaa50da03e3a0c2d8
Diffstat (limited to 'remoteexec')
-rw-r--r--remoteexec/remoteexec.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/remoteexec/remoteexec.go b/remoteexec/remoteexec.go
index d43dc6c01..f51192263 100644
--- a/remoteexec/remoteexec.go
+++ b/remoteexec/remoteexec.go
@@ -148,7 +148,8 @@ func (r *REParams) Template() string {
// locally executable rule and the second rule is a remotely executable rule.
func StaticRules(ctx android.PackageContext, name string, ruleParams blueprint.RuleParams, reParams *REParams, commonArgs []string, reArgs []string) (blueprint.Rule, blueprint.Rule) {
ruleParamsRE := ruleParams
- ruleParamsRE.Command = reParams.Template() + ruleParamsRE.Command
+ ruleParams.Command = strings.ReplaceAll(ruleParams.Command, "$reTemplate", "")
+ ruleParamsRE.Command = strings.ReplaceAll(ruleParamsRE.Command, "$reTemplate", reParams.Template())
return ctx.AndroidStaticRule(name, ruleParams, commonArgs...),
ctx.AndroidRemoteStaticRule(name+"RE", android.RemoteRuleSupports{RBE: true}, ruleParamsRE, append(commonArgs, reArgs...)...)