Update aconfig storage generation function
aconfig storage files are generated from aconfig_flags.pb instead of
all cache files with the aosp/3277171 change.
Bug: 381019197
Test: build gsi_arm64_soong_system && compare system images
Change-Id: Id2f698fdb2a2cbd7b15457be0fe898236ef33fee
diff --git a/filesystem/aconfig_files.go b/filesystem/aconfig_files.go
index 608fccd..7de404f 100644
--- a/filesystem/aconfig_files.go
+++ b/filesystem/aconfig_files.go
@@ -52,6 +52,8 @@
sb.WriteString(aconfigToolPath.String())
sb.WriteString(" dump-cache --dedup --format protobuf --out ")
sb.WriteString(installAconfigFlagsPath.String())
+ sb.WriteString(" --filter container:")
+ sb.WriteString(f.PartitionType())
sb.WriteString(" \\\n")
sb.WriteString(sbCaches.String())
cmd.ImplicitOutput(installAconfigFlagsPath)
@@ -71,8 +73,9 @@
sb.WriteString(fileType)
sb.WriteString(" --out ")
sb.WriteString(outputPath.String())
- sb.WriteString(" \\\n")
- sb.WriteString(sbCaches.String())
+ sb.WriteString(" --cache ")
+ sb.WriteString(installAconfigFlagsPath.String())
+ sb.WriteRune('\n')
cmd.ImplicitOutput(outputPath)
f.appendToEntry(ctx, outputPath)
}