From 52e53c643ee30aab988b394a16413aa01218a371 Mon Sep 17 00:00:00 2001 From: Jihoon Kang Date: Fri, 7 Mar 2025 00:05:49 +0000 Subject: 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 --- filesystem/filesystem.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 8b3b51e89..6eada58ea 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -651,11 +651,16 @@ func (f *filesystem) GenerateAndroidBuildActions(ctx android.ModuleContext) { 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 { -- cgit v1.2.3-59-g8ed1b