StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logical_partition.groups.partitions.filesystem can be empty

Browse Source 
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
This commit is contained in:
Jiyong Park
2024-08-27 17:58:36 +09:00
parent 1282d27291
commit 43b157a265
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
filesystem/logical_partition.go
View File

@@ -146,9 +146,16 @@ func (l *logicalPartition) GenerateAndroidBuildActions(ctx android.ModuleContext
partitionNames[pName] = true partitionNames[pName] = true
} }
// Get size of the partition by reading the -size.txt file // 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.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 // 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. // 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) { 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)) img := android.PathForModuleSrc(ctx, proptools.String(p.Filesystem))
name := proptools.String(p.Name) name := proptools.String(p.Name)
sparseImg = android.PathForModuleOut(ctx, name+".img").OutputPath sparseImg = android.PathForModuleOut(ctx, name+".img").OutputPath