Convert depsToPaths to use ModuleProxy for both cc and rust.
Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: Id465f293c3615fc803b34c990f19b4386ebece1c
diff --git a/cc/library.go b/cc/library.go
index 5c2cb5d..de09d53 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -1225,12 +1225,11 @@
continue
}
flagInfo, _ := android.OtherModuleProvider(ctx, stub, FlagExporterInfoProvider)
- ccInfo, ok := android.OtherModuleProvider(ctx, stub, CcInfoProvider)
- if !ok || ccInfo.LibraryInfo == nil {
- panic(fmt.Errorf("couldn't find library info for %s", stub))
+ if _, ok = android.OtherModuleProvider(ctx, stub, CcInfoProvider); !ok {
+ panic(fmt.Errorf("stub is not a cc module %s", stub))
}
stubsInfo = append(stubsInfo, SharedStubLibrary{
- Version: ccInfo.LibraryInfo.StubsVersion,
+ Version: android.OtherModuleProviderOrDefault(ctx, stub, LinkableInfoProvider).StubsVersion,
SharedLibraryInfo: stubInfo,
FlagExporterInfo: flagInfo,
})