From 31ec942ff7e2c5fca9c10eaa6c9c3c7bef2e1637 Mon Sep 17 00:00:00 2001 From: Ramy Medhat Date: Fri, 17 Apr 2020 15:03:58 -0400 Subject: Add support for remotely executing header-abi-dumper actions. Test: built with and without RBE_ABI_DUMPER set. Change-Id: Ie752c07325453076d191813eaa50da03e3a0c2d8 --- remoteexec/remoteexec.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'remoteexec/remoteexec.go') 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...)...) -- cgit v1.2.3-59-g8ed1b