From 6aefe7d4ec81ec0da8fefc070c9d9849d7a795a0 Mon Sep 17 00:00:00 2001 From: mrziwang Date: Tue, 7 Jan 2025 16:27:53 -0800 Subject: Rename confusing var names in filesystem_creator Test: CI and unit tests Change-Id: I2701fc5c7d96ba0cc6897447607af948ac60a197 --- fsgen/filesystem_creator.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'fsgen/filesystem_creator.go') diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go index 016015914..560c201d1 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -849,8 +849,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) } @@ -905,12 +905,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 { -- cgit v1.2.3-59-g8ed1b