summaryrefslogtreecommitdiff
path: root/linkerconfig/linkerconfig.go
diff options
context:
space:
mode:
author Yu Liu <yudiliu@google.com> 2025-03-14 15:56:03 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-03-14 15:56:03 -0700
commitf2aacebb28cf16f9c3fa4c59a9a9a931ab6b0846 (patch)
treeda660a6da02da57b771ebc1f7ea1bf3189a90c47 /linkerconfig/linkerconfig.go
parent5fe9b839b0b67218bcdfdbeec06b6813f040939e (diff)
parentf22120fb1da7f75a571966124bb0da6a57fd4f07 (diff)
Merge "Change CommonModuleInfoProvider to a pointer." into main
Diffstat (limited to 'linkerconfig/linkerconfig.go')
-rw-r--r--linkerconfig/linkerconfig.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/linkerconfig/linkerconfig.go b/linkerconfig/linkerconfig.go
index d117c52a8..925d7b163 100644
--- a/linkerconfig/linkerconfig.go
+++ b/linkerconfig/linkerconfig.go
@@ -127,7 +127,7 @@ func BuildLinkerConfig(
for _, m := range requireModules {
if _, ok := android.OtherModuleProvider(ctx, m, cc.CcInfoProvider); ok {
if android.OtherModuleProviderOrDefault(ctx, m, cc.LinkableInfoProvider).HasStubsVariants &&
- !android.OtherModuleProviderOrDefault(ctx, m, android.CommonModuleInfoProvider).Host {
+ !android.OtherModulePointerProviderOrDefault(ctx, m, android.CommonModuleInfoProvider).Host {
name := ctx.OtherModuleName(m)
if ccInfo, ok := android.OtherModuleProvider(ctx, m, cc.CcInfoProvider); ok && ccInfo.LinkerInfo != nil && ccInfo.LinkerInfo.ImplementationModuleName != nil {
name = *ccInfo.LinkerInfo.ImplementationModuleName