rust: Rename flag providers for clarity
Rename the Rust flag and export info providers to make it more clear
when workign with the Rust exporter vs the cc exporter.
Also renames a test for additional clarity.
Test: m blueprint_tests
Change-Id: I652b55ef000a2cd00f47b1dbfe86713c33ae9d63
diff --git a/rust/rust.go b/rust/rust.go
index f4fda22..b1880cf 100644
--- a/rust/rust.go
+++ b/rust/rust.go
@@ -573,8 +573,8 @@
flagExporter.wholeStaticLibObjects = android.FirstUniqueStrings(append(flagExporter.wholeStaticLibObjects, flags...))
}
-func (flagExporter *flagExporter) setProvider(ctx ModuleContext) {
- android.SetProvider(ctx, FlagExporterInfoProvider, FlagExporterInfo{
+func (flagExporter *flagExporter) setRustProvider(ctx ModuleContext) {
+ android.SetProvider(ctx, RustFlagExporterInfoProvider, RustFlagExporterInfo{
LinkDirs: flagExporter.linkDirs,
RustLibObjects: flagExporter.rustLibPaths,
StaticLibObjects: flagExporter.staticLibObjects,
@@ -589,7 +589,7 @@
return &flagExporter{}
}
-type FlagExporterInfo struct {
+type RustFlagExporterInfo struct {
Flags []string
LinkDirs []string
RustLibObjects []string
@@ -598,7 +598,7 @@
SharedLibPaths []string
}
-var FlagExporterInfoProvider = blueprint.NewProvider[FlagExporterInfo]()
+var RustFlagExporterInfoProvider = blueprint.NewProvider[RustFlagExporterInfo]()
func (mod *Module) isCoverageVariant() bool {
return mod.coverage.Properties.IsCoverageVariant
@@ -1573,7 +1573,7 @@
directSrcProvidersDeps = append(directSrcProvidersDeps, &dep)
}
- exportedInfo, _ := android.OtherModuleProvider(ctx, dep, FlagExporterInfoProvider)
+ exportedInfo, _ := android.OtherModuleProvider(ctx, dep, RustFlagExporterInfoProvider)
//Append the dependencies exported objects, except for proc-macros which target a different arch/OS
if depTag != procMacroDepTag {