diff options
| author | 2025-02-13 02:05:00 +0000 | |
|---|---|---|
| committer | 2025-02-19 00:18:39 +0000 | |
| commit | 0a37d429bcbfdf5110bbfcf14f43764dc01585a4 (patch) | |
| tree | acda2280ff7ee8cd210a9696b615297d64c4d5b4 /rust | |
| parent | 9354e34a7b2ba36b1e611dc0f062416649decbeb (diff) | |
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
Diffstat (limited to 'rust')
| -rw-r--r-- | rust/rust.go | 4 |
1 files changed, 2 insertions, 2 deletions
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 } } |