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

Build aconfig storage files from soong filesystem am: 162098358c

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

Change-Id: If6fe4c9be71d42ee9c0c721af9199fd40e41bc22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Justin Yun
2024-05-16 05:53:08 +00:00
committed by Automerger Merge Worker
parent dc707eb7fa 162098358c
commit b3d004bb9a
1 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
filesystem/aconfig_files.go
View File

@@ -22,7 +22,7 @@ import (
"github.com/google/blueprint/proptools" "github.com/google/blueprint/proptools"
) )
func (f *filesystem) buildAconfigFlagsFiles(ctx android.ModuleContext, builder *android.RuleBuilder, specs map[string]android.PackagingSpec, dir android.Path) { func (f *filesystem) buildAconfigFlagsFiles(ctx android.ModuleContext, builder *android.RuleBuilder, specs map[string]android.PackagingSpec, dir android.OutputPath) {
if !proptools.Bool(f.properties.Gen_aconfig_flags_pb) { if !proptools.Bool(f.properties.Gen_aconfig_flags_pb) {
return return
} }
@@ -31,15 +31,6 @@ func (f *filesystem) buildAconfigFlagsFiles(ctx android.ModuleContext, builder *
aconfigToolPath := ctx.Config().HostToolPath(ctx, "aconfig") aconfigToolPath := ctx.Config().HostToolPath(ctx, "aconfig")
cmd := builder.Command().Tool(aconfigFlagsBuilderPath).Implicit(aconfigToolPath) cmd := builder.Command().Tool(aconfigFlagsBuilderPath).Implicit(aconfigToolPath)
installAconfigFlags := filepath.Join(dir.String(), "etc", "aconfig_flags_"+f.partitionName()+".pb")
var sb strings.Builder
sb.WriteString("set -e\n")
sb.WriteString(aconfigToolPath.String())
sb.WriteString(" dump-cache --dedup --format protobuf --out ")
sb.WriteString(installAconfigFlags)
sb.WriteString(" \\\n")
var caches []string var caches []string
for _, ps := range specs { for _, ps := range specs {
cmd.Implicits(ps.GetAconfigPaths()) cmd.Implicits(ps.GetAconfigPaths())
@@ -47,12 +38,45 @@ func (f *filesystem) buildAconfigFlagsFiles(ctx android.ModuleContext, builder *
} }
caches = android.SortedUniqueStrings(caches) caches = android.SortedUniqueStrings(caches)
var sbCaches strings.Builder
for _, cache := range caches { for _, cache := range caches {
sb.WriteString(" --cache ") sbCaches.WriteString(" --cache ")
sb.WriteString(cache) sbCaches.WriteString(cache)
sb.WriteString(" \\\n") sbCaches.WriteString(" \\\n")
} }
sbCaches.WriteRune('\n')
var sb strings.Builder
sb.WriteString("set -e\n")
installAconfigFlagsPath := dir.Join(ctx, "etc", "aconfig_flags.pb")
sb.WriteString(aconfigToolPath.String())
sb.WriteString(" dump-cache --dedup --format protobuf --out ")
sb.WriteString(installAconfigFlagsPath.String())
sb.WriteString(" \\\n")
sb.WriteString(sbCaches.String())
cmd.ImplicitOutput(installAconfigFlagsPath)
installAconfigStorageDir := dir.Join(ctx, "etc", "aconfig")
sb.WriteString("mkdir -p ")
sb.WriteString(installAconfigStorageDir.String())
sb.WriteRune('\n') sb.WriteRune('\n')
generatePartitionAconfigStorageFile := func(fileType, fileName string) {
sb.WriteString(aconfigToolPath.String())
sb.WriteString(" create-storage --container ")
sb.WriteString(f.PartitionType())
sb.WriteString(" --file ")
sb.WriteString(fileType)
sb.WriteString(" --out ")
sb.WriteString(filepath.Join(installAconfigStorageDir.String(), fileName))
sb.WriteString(" \\\n")
sb.WriteString(sbCaches.String())
cmd.ImplicitOutput(installAconfigStorageDir.Join(ctx, fileName))
}
generatePartitionAconfigStorageFile("package_map", "package.map")
generatePartitionAconfigStorageFile("flag_map", "flag.map")
generatePartitionAconfigStorageFile("flag_val", "flag.val")
android.WriteExecutableFileRuleVerbatim(ctx, aconfigFlagsBuilderPath, sb.String()) android.WriteExecutableFileRuleVerbatim(ctx, aconfigFlagsBuilderPath, sb.String())
} }