diff options
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/linker.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cc/linker.go b/cc/linker.go index af4cbf33..a7b621a9 100644 --- a/cc/linker.go +++ b/cc/linker.go @@ -501,19 +501,21 @@ func init() { var injectVersionSymbol = pctx.AndroidStaticRule("injectVersionSymbol", blueprint.RuleParams{ Command: "$symbolInjectCmd -i $in -o $out -s soong_build_number " + - "-from 'SOONG BUILD NUMBER PLACEHOLDER' -v $buildNumberFromFile", + "-from 'SOONG BUILD NUMBER PLACEHOLDER' -v $$(cat $buildNumberFile)", CommandDeps: []string{"$symbolInjectCmd"}, }, - "buildNumberFromFile") + "buildNumberFile") func (linker *baseLinker) injectVersionSymbol(ctx ModuleContext, in android.Path, out android.WritablePath) { + buildNumberFile := ctx.Config().BuildNumberFile(ctx) ctx.Build(pctx, android.BuildParams{ Rule: injectVersionSymbol, Description: "inject version symbol", Input: in, Output: out, + OrderOnly: android.Paths{buildNumberFile}, Args: map[string]string{ - "buildNumberFromFile": proptools.NinjaEscape(ctx.Config().BuildNumberFromFile()), + "buildNumberFile": buildNumberFile.String(), }, }) } |