StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix non-determinism in all_teams.pb" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-02-05 23:29:14 +00:00
committed by Gerrit Code Review
parent 6c392749d5 2268cd8b8b
commit 87177f21b4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/all_teams.go
View File

@@ -118,8 +118,8 @@ func (this *allTeamsSingleton) MakeVars(ctx MakeVarsContext) {
// either the declared team data for that module or the package default team data for that module. // either the declared team data for that module or the package default team data for that module.
func (this *allTeamsSingleton) lookupTeamForAllModules() *team_proto.AllTeams { func (this *allTeamsSingleton) lookupTeamForAllModules() *team_proto.AllTeams {
teamsProto := make([]*team_proto.Team, len(this.teams_for_mods)) teamsProto := make([]*team_proto.Team, len(this.teams_for_mods))
i := 0 for i, moduleName := range SortedKeys(this.teams_for_mods) {
for moduleName, m := range this.teams_for_mods { m, _ := this.teams_for_mods[moduleName]
teamName := m.teamName teamName := m.teamName
var teamProperties teamProperties var teamProperties teamProperties
found := false found := false
@@ -152,7 +152,6 @@ func (this *allTeamsSingleton) lookupTeamForAllModules() *team_proto.AllTeams {
} }
} }
teamsProto[i] = teamData teamsProto[i] = teamData
i++
} }
return &team_proto.AllTeams{Teams: teamsProto} return &team_proto.AllTeams{Teams: teamsProto}
} }