From 5db2f3ea7ec4a41f60d6e94870c99239e4035506 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 19 Feb 2025 12:49:37 -0800 Subject: Fix nondeterministic FullInstallPathInfo list This list later shows up in the ninja file in soong-only builds, make sure it's deterministic. Test: Presubmits Change-Id: Id121b8b95a543cd019f7c51f4121aa2c761f8a9f --- filesystem/filesystem.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index f84993de7..220a8c6a4 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -587,7 +587,8 @@ func (f *filesystem) GenerateAndroidBuildActions(ctx android.ModuleContext) { specs := f.gatherFilteredPackagingSpecs(ctx) var fullInstallPaths []FullInstallPathInfo - for _, spec := range specs { + for _, specRel := range android.SortedKeys(specs) { + spec := specs[specRel] fullInstallPaths = append(fullInstallPaths, FullInstallPathInfo{ FullInstallPath: spec.FullInstallPath(), RequiresFullInstall: spec.RequiresFullInstall(), -- cgit v1.2.3-59-g8ed1b