openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Add default group support for logical_partition" am: ce08a57bb1 am: 0c00222c5e am: e49ec6219a 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1657799

Change-Id: I14109cbccc672868c0520a8c75477205e08fa805
This commit is contained in:
Treehugger Robot 2021-04-01 02:40:12 +00:00 committed by Automerger Merge Worker
parent a713a8b987 e49ec6219a
commit e77e82f103
1 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
filesystem/logical_partition.go
View File

@ -43,6 +43,10 @@ type logicalPartitionProperties struct {
// Total size of the logical partition
Size *string
// List of partitions for default group. Default group has no size limit and automatically
// minimized when creating an image.
Default_group []partitionProperties
// List of groups. A group defines a fixed sized region. It can host one or more logical
// partitions and their total size is limited by the size of the group they are in.
Groups []groupProperties
@ -52,7 +56,7 @@ type logicalPartitionProperties struct {
}
type groupProperties struct {
// Name of the partition group
// Name of the partition group. Can't be "default"; use default_group instead.
Name *string
// Size of the partition group
@ -92,8 +96,9 @@ func (l *logicalPartition) GenerateAndroidBuildActions(ctx android.ModuleContext
// Sparse the filesystem images and calculate their sizes
sparseImages := make(map[string]android.OutputPath)
sparseImageSizes := make(map[string]android.OutputPath)
for _, group := range l.properties.Groups {
for _, part := range group.Partitions {
sparsePartitions := func(partitions []partitionProperties) {
for _, part := range partitions {
sparseImg, sizeTxt := sparseFilesystem(ctx, part, builder)
pName := proptools.String(part.Name)
sparseImages[pName] = sparseImg
@ -101,6 +106,12 @@ func (l *logicalPartition) GenerateAndroidBuildActions(ctx android.ModuleContext
}
}
for _, group := range l.properties.Groups {
sparsePartitions(group.Partitions)
}
sparsePartitions(l.properties.Default_group)
cmd := builder.Command().BuiltTool("lpmake")
size := proptools.String(l.properties.Size)
@ -123,10 +134,32 @@ func (l *logicalPartition) GenerateAndroidBuildActions(ctx android.ModuleContext
groupNames := make(map[string]bool)
partitionNames := make(map[string]bool)
addPartitionsToGroup := func(partitions []partitionProperties, gName string) {
for _, part := range partitions {
pName := proptools.String(part.Name)
if pName == "" {
ctx.PropertyErrorf("groups.partitions.name", "must be set")
}
if _, ok := partitionNames[pName]; ok {
ctx.PropertyErrorf("groups.partitions.name", "already exists")
} else {
partitionNames[pName] = true
}
// Get size of the partition by reading the -size.txt file
pSize := fmt.Sprintf("$(cat %s)", sparseImageSizes[pName])
cmd.FlagWithArg("--partition=", fmt.Sprintf("%s:readonly:%s:%s", pName, pSize, gName))
cmd.FlagWithInput("--image="+pName+"=", sparseImages[pName])
}
}
addPartitionsToGroup(l.properties.Default_group, "default")
for _, group := range l.properties.Groups {
gName := proptools.String(group.Name)
if gName == "" {
ctx.PropertyErrorf("groups.name", "must be set")
} else if gName == "default" {
ctx.PropertyErrorf("groups.name", `can't use "default" as a group name. Use default_group instead`)
}
if _, ok := groupNames[gName]; ok {
ctx.PropertyErrorf("group.name", "already exists")
@ -142,21 +175,7 @@ func (l *logicalPartition) GenerateAndroidBuildActions(ctx android.ModuleContext
}
cmd.FlagWithArg("--group=", gName+":"+gSize)
for _, part := range group.Partitions {
pName := proptools.String(part.Name)
if pName == "" {
ctx.PropertyErrorf("groups.partitions.name", "must be set")
}
if _, ok := partitionNames[pName]; ok {
ctx.PropertyErrorf("groups.partitions.name", "already exists")
} else {
partitionNames[pName] = true
}
// Get size of the partition by reading the -size.txt file
pSize := fmt.Sprintf("$(cat %s)", sparseImageSizes[pName])
cmd.FlagWithArg("--partition=", fmt.Sprintf("%s:readonly:%s:%s", pName, pSize, gName))
cmd.FlagWithInput("--image="+pName+"=", sparseImages[pName])
}
addPartitionsToGroup(group.Partitions, gName)
}
l.output = android.PathForModuleOut(ctx, l.installFileName()).OutputPath