summaryrefslogtreecommitdiff
path: root/android/makevars.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 /android/makevars.go
parent5fe9b839b0b67218bcdfdbeec06b6813f040939e (diff)
parentf22120fb1da7f75a571966124bb0da6a57fd4f07 (diff)
Merge "Change CommonModuleInfoProvider to a pointer." into main
Diffstat (limited to 'android/makevars.go')
-rw-r--r--android/makevars.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/makevars.go b/android/makevars.go
index e1d947dff..7017e7db0 100644
--- a/android/makevars.go
+++ b/android/makevars.go
@@ -259,7 +259,7 @@ func (s *makeVarsSingleton) GenerateBuildActions(ctx SingletonContext) {
singletonDists.lock.Unlock()
ctx.VisitAllModuleProxies(func(m ModuleProxy) {
- commonInfo, _ := OtherModuleProvider(ctx, m, CommonModuleInfoProvider)
+ commonInfo := OtherModulePointerProviderOrDefault(ctx, m, CommonModuleInfoProvider)
if provider, ok := OtherModuleProvider(ctx, m, ModuleMakeVarsInfoProvider); ok &&
commonInfo.Enabled {
mctx := &makeVarsContext{