diff --git a/android/override_module.go b/android/override_module.go index 6b246db41..3994084a8 100644 --- a/android/override_module.go +++ b/android/override_module.go @@ -28,6 +28,7 @@ package android // module based on it. import ( + "sort" "sync" "github.com/google/blueprint" @@ -161,6 +162,11 @@ func (b *OverridableModuleBase) addOverride(o OverrideModule) { // Should NOT be used in the same mutator as addOverride. 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 }