diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-28 21:26:56 +0000 |
|---|---|---|
| committer | Julien Desprez <jdesprez@google.com> | 2020-04-09 08:17:32 -0700 |
| commit | 82f316b8dbc6c641be2cdc2795160df089e9da82 (patch) | |
| tree | 8a7bc3abb9e74900394aa5e15eb00fecfdf8a7a7 /cc | |
| parent | 3978d03fb70887e9a3fcd5685a01062e02e176eb (diff) | |
| download | build_soong-82f316b8dbc6c641be2cdc2795160df089e9da82.tar.gz build_soong-82f316b8dbc6c641be2cdc2795160df089e9da82.tar.bz2 build_soong-82f316b8dbc6c641be2cdc2795160df089e9da82.zip | |
Add support for order-only dependencies to RuleBuilder
Test: TestRuleBuilder
Change-Id: I1609a790dd4d0a03c8308b6e552622fe33fa2499
Bug: 153071808
Merged-In: Icfa98d6840b1dc2e273ba29c33011635d1cf93b1
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(), }, }) } |