Fix ninja_determinism_test CI breakage
Bug: 394671084
Test: m nothing && md5sum out/soong/build.aosp_cf*.ninja, run twice and md5 hashes should be same
Change-Id: I2aba876faac32dd6329da29a280fcb06f1270b50
diff --git a/java/java.go b/java/java.go
index 900f0e3..cd46e7f 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1189,7 +1189,7 @@
for _, paths := range ctx.GetOutputFiles().TaggedOutputFiles {
builtFiles = append(builtFiles, paths.Strings()...)
}
- complianceMetadataInfo.SetListValue(android.ComplianceMetadataProp.BUILT_FILES, android.FirstUniqueStrings(builtFiles))
+ complianceMetadataInfo.SetListValue(android.ComplianceMetadataProp.BUILT_FILES, android.SortedUniqueStrings(builtFiles))
// Static deps
staticDepNames := make([]string, 0)
@@ -1202,8 +1202,8 @@
staticDepFiles = append(staticDepFiles, dep.ResourceJars...)
}
})
- complianceMetadataInfo.SetListValue(android.ComplianceMetadataProp.STATIC_DEPS, android.FirstUniqueStrings(staticDepNames))
- complianceMetadataInfo.SetListValue(android.ComplianceMetadataProp.STATIC_DEP_FILES, android.FirstUniqueStrings(staticDepFiles.Strings()))
+ complianceMetadataInfo.SetListValue(android.ComplianceMetadataProp.STATIC_DEPS, android.SortedUniqueStrings(staticDepNames))
+ complianceMetadataInfo.SetListValue(android.ComplianceMetadataProp.STATIC_DEP_FILES, android.SortedUniqueStrings(staticDepFiles.Strings()))
}
func (j *Library) getJarInstallDir(ctx android.ModuleContext) android.InstallPath {