diff options
| author | 2024-12-11 01:37:20 +0000 | |
|---|---|---|
| committer | 2024-12-11 01:37:20 +0000 | |
| commit | 1f1e901cb1b9b4bbdcecb97a2c31cd620f0311f9 (patch) | |
| tree | 5a388e792eedacad8c8df0301069b83c9aad91a6 /rust/sanitize.go | |
| parent | aecbbc24dea1a92b8ce7eab4fb88de128f4e46b7 (diff) | |
| parent | e489db477b9bc260062c4b4cbfce394e63befe2d (diff) | |
Merge "Move parent static check in cc.Module.DepIsInSameApex into tag" into main am: e489db477b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3393289
Change-Id: If890f16d88878a641ee0584f2c6e8518b39039d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'rust/sanitize.go')
| -rw-r--r-- | rust/sanitize.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rust/sanitize.go b/rust/sanitize.go index b8f922fe2..4c82de5e8 100644 --- a/rust/sanitize.go +++ b/rust/sanitize.go @@ -281,7 +281,7 @@ func rustSanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) { } else { variations = append(variations, blueprint.Variation{Mutator: "link", Variation: "shared"}) - depTag = cc.SharedDepTag() + depTag = cc.SharedDepTag(mod.Static()) deps = []string{config.LibclangRuntimeLibrary(mod.toolchain(mctx), "asan")} } } else if mod.IsSanitizerEnabled(cc.Hwasan) { @@ -296,7 +296,7 @@ func rustSanitizerRuntimeMutator(mctx android.BottomUpMutatorContext) { // library during final link if necessary variations = append(variations, blueprint.Variation{Mutator: "link", Variation: "shared"}) - depTag = cc.SharedDepTag() + depTag = cc.SharedDepTag(mod.Static()) deps = []string{config.LibclangRuntimeLibrary(mod.toolchain(mctx), "hwasan")} } |