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/android_device.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'filesystem/android_device.go') diff --git a/filesystem/android_device.go b/filesystem/android_device.go index 17209ed4a..86771d13a 100644 --- a/filesystem/android_device.go +++ b/filesystem/android_device.go @@ -323,6 +323,10 @@ func (a *androidDevice) distFiles(ctx android.ModuleContext) { 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) -- cgit v1.2.3-59-g8ed1b