diff options
| author | 2025-01-08 09:48:01 -0800 | |
|---|---|---|
| committer | 2025-01-08 09:48:01 -0800 | |
| commit | 0149d1bab2d8ff9fc4eee979e63cc59543be14f6 (patch) | |
| tree | 8cad834a7ef4203be9c2be7f228db84447eac65e /fsgen/filesystem_creator.go | |
| parent | 1be00e470e6cf57e8ff2ab360e4c9642c6c84477 (diff) | |
| parent | 6aefe7d4ec81ec0da8fefc070c9d9849d7a795a0 (diff) | |
Merge "Rename confusing var names in filesystem_creator" into main
Diffstat (limited to 'fsgen/filesystem_creator.go')
| -rw-r--r-- | fsgen/filesystem_creator.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go index 3853e5dfe..41faf948a 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -858,8 +858,8 @@ func getAvbInfo(config android.Config, partitionType string) avbInfo { func (f *filesystemCreator) createFileListDiffTest(ctx android.ModuleContext, partitionType string) android.Path { partitionModuleName := generatedModuleNameForPartition(ctx.Config(), partitionType) - systemImage := ctx.GetDirectDepWithTag(partitionModuleName, generatedFilesystemDepTag) - filesystemInfo, ok := android.OtherModuleProvider(ctx, systemImage, filesystem.FilesystemProvider) + partitionImage := ctx.GetDirectDepWithTag(partitionModuleName, generatedFilesystemDepTag) + filesystemInfo, ok := android.OtherModuleProvider(ctx, partitionImage, filesystem.FilesystemProvider) if !ok { ctx.ModuleErrorf("Expected module %s to provide FileysystemInfo", partitionModuleName) } @@ -914,12 +914,12 @@ func createDiffTest(ctx android.ModuleContext, diffTestResultFile android.Writab builder.Build("diff test "+diffTestResultFile.String(), "diff test") } -type systemImageDepTagType struct { +type imageDepTagType struct { blueprint.BaseDependencyTag } -var generatedFilesystemDepTag systemImageDepTagType -var generatedVbmetaPartitionDepTag systemImageDepTagType +var generatedFilesystemDepTag imageDepTagType +var generatedVbmetaPartitionDepTag imageDepTagType func (f *filesystemCreator) DepsMutator(ctx android.BottomUpMutatorContext) { for _, partitionType := range f.properties.Generated_partition_types { |