Change depVisitor to use providers instead of type-asserting to
interfaces directly, the next step is to change it to use ModuleProxy
once IsDepInSameApex is ready.
Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: I13a4e256a26dbf7f9b3b746d628ac8f68b4e598e
diff --git a/rust/rust.go b/rust/rust.go
index 7a7b106..713cacc 100644
--- a/rust/rust.go
+++ b/rust/rust.go
@@ -841,7 +841,7 @@
return shared
}
-func (mod *Module) ImplementationModuleNameForMake(ctx android.BaseModuleContext) string {
+func (mod *Module) ImplementationModuleNameForMake() string {
name := mod.BaseModuleName()
if versioned, ok := mod.compiler.(cc.VersionedInterface); ok {
name = versioned.ImplementationModuleName(name)
@@ -1411,7 +1411,7 @@
if rustInfo != nil {
// Use base module name for snapshots when exporting to Makefile.
if rustInfo.SnapshotInfo != nil {
- baseName := linkableInfo.BaseModuleName
+ baseName := commonInfo.BaseModuleName
return baseName + rustInfo.SnapshotInfo.SnapshotAndroidMkSuffix + rustInfo.AndroidMkSuffix
}
}