diff options
| author | 2025-03-10 13:41:49 -0700 | |
|---|---|---|
| committer | 2025-03-10 13:41:49 -0700 | |
| commit | a369dc00143821fa7784d1bfa9d2986186b23742 (patch) | |
| tree | 39c1e14bbff8b6c1d28f7543880240809d61220c /android/module.go | |
| parent | cfbdb0cec0d89feccb3cd8231a4095f673f74b29 (diff) | |
| parent | ef9e63e775493bd73cb28917ad59e6b10e5506b5 (diff) | |
Merge "Rename CommonModuleInfoKey to be consistent with others." into main
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/android/module.go b/android/module.go index a56fea322..3d643f915 100644 --- a/android/module.go +++ b/android/module.go @@ -1483,7 +1483,7 @@ func (m *ModuleBase) computeInstallDeps(ctx ModuleContext) ([]depset.DepSet[Inst // Installation is still handled by Make, so anything hidden from Make is not // installable. info := OtherModuleProviderOrDefault(ctx, dep, InstallFilesProvider) - commonInfo := OtherModuleProviderOrDefault(ctx, dep, CommonModuleInfoKey) + commonInfo := OtherModuleProviderOrDefault(ctx, dep, CommonModuleInfoProvider) if !commonInfo.HideFromMake && !commonInfo.SkipInstall { installDeps = append(installDeps, info.TransitiveInstallFiles) } @@ -1500,7 +1500,7 @@ func (m *ModuleBase) computeInstallDeps(ctx ModuleContext) ([]depset.DepSet[Inst // should also install the output files of the given dependency and dependency tag. func isInstallDepNeeded(ctx ModuleContext, dep ModuleProxy) bool { // Don't add a dependency from the platform to a library provided by an apex. - if OtherModuleProviderOrDefault(ctx, dep, CommonModuleInfoKey).UninstallableApexPlatformVariant { + if OtherModuleProviderOrDefault(ctx, dep, CommonModuleInfoProvider).UninstallableApexPlatformVariant { return false } // Only install modules if the dependency tag is an InstallDepNeeded tag. @@ -1923,7 +1923,7 @@ type ApiLevelOrPlatform struct { IsPlatform bool } -var CommonModuleInfoKey = blueprint.NewProvider[CommonModuleInfo]() +var CommonModuleInfoProvider = blueprint.NewProvider[CommonModuleInfo]() type PrebuiltModuleInfo struct { SourceExists bool @@ -2331,7 +2331,7 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) if mm, ok := m.module.(interface{ BaseModuleName() string }); ok { commonData.BaseModuleName = mm.BaseModuleName() } - SetProvider(ctx, CommonModuleInfoKey, commonData) + SetProvider(ctx, CommonModuleInfoProvider, commonData) if p, ok := m.module.(PrebuiltInterface); ok && p.Prebuilt() != nil { SetProvider(ctx, PrebuiltModuleInfoProvider, PrebuiltModuleInfo{ SourceExists: p.Prebuilt().SourceExists(), |