summaryrefslogtreecommitdiff
path: root/rust/rust.go
diff options
context:
space:
mode:
author Inseob Kim <inseob@google.com> 2023-03-31 18:04:12 +0900
committer Inseob Kim <inseob@google.com> 2023-03-31 18:04:12 +0900
commitcd2b46aae3bcbff22c99066fbb1b7a5a4e9f5b34 (patch)
tree85d2ec90cf3ebd86e83e517fb6aaa39b542675ff /rust/rust.go
parent3b7cb59e4e75a40388b54cf3228ea637b1840e17 (diff)
Fix rust snapshotInfo provider bug
We must pass pointer of pointer to correctly cash snapshotInfo and register provider only once. Bug: 271215084 Test: build Change-Id: Ia7b43c7b97a8fcabd3b4d6ac8b990c622b6ceb6e
Diffstat (limited to 'rust/rust.go')
-rw-r--r--rust/rust.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/rust/rust.go b/rust/rust.go
index f85babca4..1c4349597 100644
--- a/rust/rust.go
+++ b/rust/rust.go
@@ -1516,7 +1516,7 @@ func (mod *Module) DepsMutator(actx android.BottomUpMutatorContext) {
for _, lib := range deps.Rustlibs {
if autoDep.depTag == rlibDepTag {
// Handle the rlib deptag case
- addRlibDependency(actx, lib, mod, snapshotInfo, rlibDepVariations)
+ addRlibDependency(actx, lib, mod, &snapshotInfo, rlibDepVariations)
} else {
// autoDep.depTag is a dylib depTag. Not all rustlibs may be available as a dylib however.
// Check for the existence of the dylib deptag variant. Select it if available,
@@ -1527,7 +1527,7 @@ func (mod *Module) DepsMutator(actx android.BottomUpMutatorContext) {
actx.AddVariationDependencies(autoDepVariations, autoDep.depTag, lib)
} else {
// If there's no dylib dependency available, try to add the rlib dependency instead.
- addRlibDependency(actx, lib, mod, snapshotInfo, rlibDepVariations)
+ addRlibDependency(actx, lib, mod, &snapshotInfo, rlibDepVariations)
}
}
}
@@ -1616,8 +1616,8 @@ func (mod *Module) DepsMutator(actx android.BottomUpMutatorContext) {
}
// addRlibDependency will add an rlib dependency, rewriting to the snapshot library if available.
-func addRlibDependency(actx android.BottomUpMutatorContext, lib string, mod *Module, snapshotInfo *cc.SnapshotInfo, variations []blueprint.Variation) {
- lib = cc.GetReplaceModuleName(lib, cc.GetSnapshot(mod, &snapshotInfo, actx).Rlibs)
+func addRlibDependency(actx android.BottomUpMutatorContext, lib string, mod *Module, snapshotInfo **cc.SnapshotInfo, variations []blueprint.Variation) {
+ lib = cc.GetReplaceModuleName(lib, cc.GetSnapshot(mod, snapshotInfo, actx).Rlibs)
actx.AddVariationDependencies(variations, rlibDepTag, lib)
}