From 0a37d429bcbfdf5110bbfcf14f43764dc01585a4 Mon Sep 17 00:00:00 2001 From: Yu Liu Date: Thu, 13 Feb 2025 02:05:00 +0000 Subject: 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 --- rust/rust.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rust/rust.go') diff --git a/rust/rust.go b/rust/rust.go index 7a7b1064c..713cacc79 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -841,7 +841,7 @@ func (mod *Module) getSharedFlags() *cc.SharedFlags { 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 @@ func rustMakeLibName(rustInfo *RustInfo, linkableInfo *cc.LinkableInfo, commonIn 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 } } -- cgit v1.2.3-59-g8ed1b