Merge "Fix out/soong/Android-<>.mk reproducibility" (2e93eb70) · Commits · e / os / android_build_soong

android/override_module.go

+6 −0

Original line number	Diff line number	Diff line
		@@ -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
		}