| commit | 82fe912d84c5a135d6521aeb80eb8767c8d8053a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jul 02 01:29:23 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 02 01:29:23 2020 +0000 |
| tree | 57be2183762dfe83cb044066cd5c50a0cde39768 | |
| parent | 3cb9c88fc5eee6701ec60bd84abca035a1656d6f [diff] | |
| parent | 5ba520122b7dfbc0ebbe4574a8329980921330d1 [diff] |
Merge "Fix out/soong/Android-<>.mk reproducibility" am: 2e93eb702d am: 5ba520122b Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353442 Change-Id: If2d5adb61a7218c5872b7c9d4d63aebe9ae4685a
diff --git a/android/override_module.go b/android/override_module.go index 6b246db..3994084 100644 --- a/android/override_module.go +++ b/android/override_module.go
@@ -28,6 +28,7 @@ // module based on it. import ( + "sort" "sync" "github.com/google/blueprint" @@ -161,6 +162,11 @@ // 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 }