diff --git a/cc/cc.go b/cc/cc.go
index ce3a2ed..67e7d7c 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -2547,7 +2547,7 @@
 
 func (c *Module) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Module) bool {
 	if depTag, ok := ctx.OtherModuleDependencyTag(dep).(DependencyTag); ok {
-		if cc, ok := dep.(*Module); ok && cc.IsStubs() && depTag.Shared {
+		if cc, ok := dep.(*Module); ok && cc.HasStubsVariants() && depTag.Shared && depTag.Library {
 			// dynamic dep to a stubs lib crosses APEX boundary
 			return false
 		}