summaryrefslogtreecommitdiff
path: root/rust/rust.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2025-02-05 15:53:39 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-02-05 15:53:39 -0800
commitac5d78f47dbadd5e4f2bd0462e982c78d49a79d7 (patch)
tree74f3562ec2504bbf92c746078c10bb62997d102c /rust/rust.go
parentf3c0d67fa49d2d6fd338c52ad445aaefadfbc297 (diff)
parentbd930bc6c4ff8539da60d6cda69f484a817a31ed (diff)
Merge changes Ia968e06b,I60192285,I0e857a64,Ia8880fe5,If7a92ca0, ... into main
* changes: Add explicitlyImpl to shared library dependency tags Don't enforce visiblity on platformBootclasspathImplLibDepTag Don't merge apex variations with different UsePlatformApis Use unique apex variations for bootclasspath fragments Correctly compute externalDep for dependencies of override_apex modules Remove extraneous variation name from OverrideApex
Diffstat (limited to 'rust/rust.go')
-rw-r--r--rust/rust.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/rust.go b/rust/rust.go
index f4fda2224..81c33e688 100644
--- a/rust/rust.go
+++ b/rust/rust.go
@@ -2129,7 +2129,7 @@ func (mod *Module) IncomingDepIsInSameApex(depTag blueprint.DependencyTag) bool
}
if mod.HasStubsVariants() {
- if cc.IsSharedDepTag(depTag) {
+ if cc.IsSharedDepTag(depTag) && !cc.IsExplicitImplSharedDepTag(depTag) {
// dynamic dep to a stubs lib crosses APEX boundary
return false
}