Modify namings of disted installed files
To match the names to those in soong+make build.
Test: m droid dist --soong-only && ls -l out/dist
Bug: 395162005
Change-Id: I196fa46de628a3dded9ba9f804337c19ddea119b
diff --git a/filesystem/android_device.go b/filesystem/android_device.go
index 17209ed..86771d1 100644
--- a/filesystem/android_device.go
+++ b/filesystem/android_device.go
@@ -323,6 +323,10 @@
if !ctx.Config().KatiEnabled() && proptools.Bool(a.deviceProps.Main_device) {
fsInfoMap := a.getFsInfos(ctx)
for _, partition := range android.SortedKeys(fsInfoMap) {
+ // installed-files-*{.txt | .json} is not disted for userdata partition
+ if partition == "userdata" {
+ continue
+ }
fsInfo := fsInfoMap[partition]
if fsInfo.InstalledFiles.Json != nil {
ctx.DistForGoal("droidcore-unbundled", fsInfo.InstalledFiles.Json)
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go
index 8b3b51e..6eada58 100644
--- a/filesystem/filesystem.go
+++ b/filesystem/filesystem.go
@@ -651,11 +651,16 @@
fileListFile := android.PathForModuleOut(ctx, "fileList")
android.WriteFileRule(ctx, fileListFile, f.installedFilesList())
- partitionName := f.partitionName()
- if partitionName == "system" {
- partitionName = ""
+ var partitionNameForInstalledFiles string
+ switch f.partitionName() {
+ case "system":
+ partitionNameForInstalledFiles = ""
+ case "vendor_ramdisk":
+ partitionNameForInstalledFiles = "vendor-ramdisk"
+ default:
+ partitionNameForInstalledFiles = f.partitionName()
}
- installedFileTxt, installedFileJson := buildInstalledFiles(ctx, partitionName, rootDir, f.output)
+ installedFileTxt, installedFileJson := buildInstalledFiles(ctx, partitionNameForInstalledFiles, rootDir, f.output)
var erofsCompressHints android.Path
if f.properties.Erofs.Compress_hints != nil {