diff options
| author | 2025-03-04 19:01:28 +0000 | |
|---|---|---|
| committer | 2025-03-07 23:16:47 +0000 | |
| commit | ef9e63e775493bd73cb28917ad59e6b10e5506b5 (patch) | |
| tree | ed7e9c2d65f85806a3ababb6bc8a1583465370a2 /rust | |
| parent | 8840812f9dfa3ba5ceecd75e582836a3c673d54b (diff) | |
Rename CommonModuleInfoKey to be consistent with others.
Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: I1ce8bc782666586633ded9cfaf1b9590e3c0efde
Diffstat (limited to 'rust')
| -rw-r--r-- | rust/doc.go | 2 | ||||
| -rw-r--r-- | rust/rust.go | 2 | ||||
| -rw-r--r-- | rust/test.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/rust/doc.go b/rust/doc.go index 2fb6ba98e..cf2f8b399 100644 --- a/rust/doc.go +++ b/rust/doc.go @@ -38,7 +38,7 @@ func (n *rustdocSingleton) GenerateBuildActions(ctx android.SingletonContext) { FlagWithArg("-D ", docDir.String()) ctx.VisitAllModuleProxies(func(module android.ModuleProxy) { - if !android.OtherModuleProviderOrDefault(ctx, module, android.CommonModuleInfoKey).Enabled { + if !android.OtherModuleProviderOrDefault(ctx, module, android.CommonModuleInfoProvider).Enabled { return } diff --git a/rust/rust.go b/rust/rust.go index 2e3d846dd..5f3d7a922 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -1480,7 +1480,7 @@ func (mod *Module) depsToPaths(ctx android.ModuleContext) PathDeps { rustInfo, hasRustInfo := android.OtherModuleProvider(ctx, dep, RustInfoProvider) ccInfo, _ := android.OtherModuleProvider(ctx, dep, cc.CcInfoProvider) linkableInfo, hasLinkableInfo := android.OtherModuleProvider(ctx, dep, cc.LinkableInfoProvider) - commonInfo := android.OtherModuleProviderOrDefault(ctx, dep, android.CommonModuleInfoKey) + commonInfo := android.OtherModuleProviderOrDefault(ctx, dep, android.CommonModuleInfoProvider) if hasRustInfo && !linkableInfo.Static && !linkableInfo.Shared { //Handle Rust Modules makeLibName := rustMakeLibName(rustInfo, linkableInfo, &commonInfo, depName+rustInfo.RustSubName) diff --git a/rust/test.go b/rust/test.go index 9833ffdb6..9b755b4b3 100644 --- a/rust/test.go +++ b/rust/test.go @@ -165,7 +165,7 @@ func (test *testDecorator) install(ctx ModuleContext) { if linkableDep.OutputFile.Valid() { // Copy the output in "lib[64]" so that it's compatible with // the default rpath values. - commonInfo := android.OtherModuleProviderOrDefault(ctx, dep, android.CommonModuleInfoKey) + commonInfo := android.OtherModuleProviderOrDefault(ctx, dep, android.CommonModuleInfoProvider) libDir := "lib" if commonInfo.Target.Arch.ArchType.Multilib == "lib64" { libDir = "lib64" |