Merge "Fix out/soong/Android-<>.mk reproducibility"

This commit is contained in:
Treehugger Robot 2020-07-02 00:57:17 +00:00 committed by Gerrit Code Review
commit 2e93eb702d
1 changed files with 6 additions and 0 deletions

View File

@ -28,6 +28,7 @@ package android
// module based on it. // module based on it.
import ( import (
"sort"
"sync" "sync"
"github.com/google/blueprint" "github.com/google/blueprint"
@ -161,6 +162,11 @@ func (b *OverridableModuleBase) addOverride(o OverrideModule) {
// Should NOT be used in the same mutator as addOverride. // Should NOT be used in the same mutator as addOverride.
func (b *OverridableModuleBase) getOverrides() []OverrideModule { func (b *OverridableModuleBase) getOverrides() []OverrideModule {
b.overridesLock.Lock()
sort.Slice(b.overrides, func(i, j int) bool {
return b.overrides[i].Name() < b.overrides[j].Name()
})
b.overridesLock.Unlock()
return b.overrides return b.overrides
} }