diff options
| author | 2025-02-11 05:36:15 -0800 | |
|---|---|---|
| committer | 2025-02-11 05:36:15 -0800 | |
| commit | ec41af1fe244c64ff0f757329548190b8eb5cae6 (patch) | |
| tree | 0f6e46fafb6bfb4d58f75fa76d8cfbb9b5dee4f6 /rust/rust.go | |
| parent | 21bb443d566510c1ecb9529787551ee880173a14 (diff) | |
| parent | 7fe65ca1fe21ee107fa7c59fd21eb7ce8bac0bd6 (diff) | |
Merge "rust: Rename flag providers for clarity" into main
Diffstat (limited to 'rust/rust.go')
| -rw-r--r-- | rust/rust.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rust/rust.go b/rust/rust.go index 90e5277b0..dfd39f739 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -573,8 +573,8 @@ func (flagExporter *flagExporter) exportWholeStaticLibs(flags ...string) { 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 @@ func NewFlagExporter() *flagExporter { return &flagExporter{} } -type FlagExporterInfo struct { +type RustFlagExporterInfo struct { Flags []string LinkDirs []string RustLibObjects []string @@ -598,7 +598,7 @@ type FlagExporterInfo struct { SharedLibPaths []string } -var FlagExporterInfoProvider = blueprint.NewProvider[FlagExporterInfo]() +var RustFlagExporterInfoProvider = blueprint.NewProvider[RustFlagExporterInfo]() func (mod *Module) isCoverageVariant() bool { return mod.coverage.Properties.IsCoverageVariant @@ -1574,7 +1574,7 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps { 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 { |