From 43b157a2650d20efeb67db0fc3d6f4ccc795bf48 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 27 Aug 2024 17:58:36 +0900 Subject: logical_partition.groups.partitions.filesystem can be empty This fixes a minor bug that filesystem image was always needed for a partition in a group. With this change, the filesystem image can be omitted (as is the case for Make). Bug: 339587835 Test: m nothing Change-Id: I2f87612ec824e1298e3bddea8a4b90932b438f41 --- filesystem/logical_partition.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'filesystem/logical_partition.go') diff --git a/filesystem/logical_partition.go b/filesystem/logical_partition.go index e483fe472..988a57b08 100644 --- a/filesystem/logical_partition.go +++ b/filesystem/logical_partition.go @@ -146,9 +146,16 @@ func (l *logicalPartition) GenerateAndroidBuildActions(ctx android.ModuleContext partitionNames[pName] = true } // Get size of the partition by reading the -size.txt file - pSize := fmt.Sprintf("$(cat %s)", sparseImageSizes[pName]) + var pSize string + if size, hasSize := sparseImageSizes[pName]; hasSize { + pSize = fmt.Sprintf("$(cat %s)", size) + } else { + pSize = "0" + } cmd.FlagWithArg("--partition=", fmt.Sprintf("%s:readonly:%s:%s", pName, pSize, gName)) - cmd.FlagWithInput("--image="+pName+"=", sparseImages[pName]) + if image, hasImage := sparseImages[pName]; hasImage { + cmd.FlagWithInput("--image="+pName+"=", image) + } } } @@ -192,6 +199,9 @@ func (l *logicalPartition) GenerateAndroidBuildActions(ctx android.ModuleContext // Add a rule that converts the filesystem for the given partition to the given rule builder. The // path to the sparse file and the text file having the size of the partition are returned. func sparseFilesystem(ctx android.ModuleContext, p partitionProperties, builder *android.RuleBuilder) (sparseImg android.OutputPath, sizeTxt android.OutputPath) { + if p.Filesystem == nil { + return + } img := android.PathForModuleSrc(ctx, proptools.String(p.Filesystem)) name := proptools.String(p.Name) sparseImg = android.PathForModuleOut(ctx, name+".img").OutputPath -- cgit v1.2.3-59-g8ed1b