Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a8c8565 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

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

When there were multiple modules overriding a single module, sometimes
we would create the list in different orders, which would trigger some
of the later mutators to write the Android-<>.mk out in different
orders.

Bug: 160207422
Test: diff out/soong/Android-<>.mk between multiple runs on internal master
Change-Id: I321db706dd34aa20a0b1556fd282d54b826a4a97
parent a66f571e

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

}