diff options
| author | 2025-03-10 13:41:49 -0700 | |
|---|---|---|
| committer | 2025-03-10 13:41:49 -0700 | |
| commit | a369dc00143821fa7784d1bfa9d2986186b23742 (patch) | |
| tree | 39c1e14bbff8b6c1d28f7543880240809d61220c /android/base_module_context.go | |
| parent | cfbdb0cec0d89feccb3cd8231a4095f673f74b29 (diff) | |
| parent | ef9e63e775493bd73cb28917ad59e6b10e5506b5 (diff) | |
Merge "Rename CommonModuleInfoKey to be consistent with others." into main
Diffstat (limited to 'android/base_module_context.go')
| -rw-r--r-- | android/base_module_context.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/base_module_context.go b/android/base_module_context.go index d2404fd3e..eba367034 100644 --- a/android/base_module_context.go +++ b/android/base_module_context.go @@ -410,7 +410,7 @@ func (b *baseModuleContext) validateAndroidModuleProxy( return &aModule } - if !OtherModuleProviderOrDefault(b, module, CommonModuleInfoKey).Enabled { + if !OtherModuleProviderOrDefault(b, module, CommonModuleInfoProvider).Enabled { if t, ok := tag.(AllowDisabledModuleDependency); !ok || !t.AllowDisabledModuleDependencyProxy(b, aModule) { if b.Config().AllowMissingDependencies() { b.AddMissingDependencies([]string{b.OtherModuleName(aModule)}) @@ -440,7 +440,7 @@ func (b *baseModuleContext) getDirectDepsInternal(name string, tag blueprint.Dep func (b *baseModuleContext) getDirectDepsProxyInternal(name string, tag blueprint.DependencyTag) []ModuleProxy { var deps []ModuleProxy b.VisitDirectDepsProxy(func(module ModuleProxy) { - if OtherModuleProviderOrDefault(b, module, CommonModuleInfoKey).BaseModuleName == name { + if OtherModuleProviderOrDefault(b, module, CommonModuleInfoProvider).BaseModuleName == name { returnedTag := b.OtherModuleDependencyTag(module) if tag == nil || returnedTag == tag { deps = append(deps, module) |