diff options
| author | 2025-03-04 19:01:28 +0000 | |
|---|---|---|
| committer | 2025-03-07 23:16:47 +0000 | |
| commit | ef9e63e775493bd73cb28917ad59e6b10e5506b5 (patch) | |
| tree | ed7e9c2d65f85806a3ababb6bc8a1583465370a2 /filesystem | |
| 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 'filesystem')
| -rw-r--r-- | filesystem/android_device.go | 2 | ||||
| -rw-r--r-- | filesystem/filesystem.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/filesystem/android_device.go b/filesystem/android_device.go index a616ee053..ebfe43c3d 100644 --- a/filesystem/android_device.go +++ b/filesystem/android_device.go @@ -927,7 +927,7 @@ func (a *androidDevice) buildApkCertsInfo(ctx android.ModuleContext, allInstalle apkCerts := []string{} for _, installedModule := range allInstalledModules { partition := "" - if commonInfo, ok := android.OtherModuleProvider(ctx, installedModule, android.CommonModuleInfoKey); ok { + if commonInfo, ok := android.OtherModuleProvider(ctx, installedModule, android.CommonModuleInfoProvider); ok { partition = commonInfo.PartitionTag } else { ctx.ModuleErrorf("%s does not set CommonModuleInfoKey", installedModule.Name()) diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 065acbdd2..d5188d7c2 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -1469,7 +1469,7 @@ func (f *filesystem) getLibsForLinkerConfig(ctx android.ModuleContext) ([]androi deps := f.gatherFilteredPackagingSpecs(ctx) ctx.WalkDepsProxy(func(child, parent android.ModuleProxy) bool { - if !android.OtherModuleProviderOrDefault(ctx, child, android.CommonModuleInfoKey).Enabled { + if !android.OtherModuleProviderOrDefault(ctx, child, android.CommonModuleInfoProvider).Enabled { return false } for _, ps := range android.OtherModuleProviderOrDefault( @@ -1490,7 +1490,7 @@ func (f *filesystem) getLibsForLinkerConfig(ctx android.ModuleContext) ([]androi var requireModules []android.ModuleProxy ctx.WalkDepsProxy(func(child, parent android.ModuleProxy) bool { - if !android.OtherModuleProviderOrDefault(ctx, child, android.CommonModuleInfoKey).Enabled { + if !android.OtherModuleProviderOrDefault(ctx, child, android.CommonModuleInfoProvider).Enabled { return false } _, parentInPackage := modulesInPackageByModule[parent] |