| commit | 93c415bde90dd5db38617d7fee422d9ca3139712 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Jul 02 01:40:33 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 02 01:40:33 2020 +0000 |
| tree | 57be2183762dfe83cb044066cd5c50a0cde39768 | |
| parent | e7743ceb1f438921e7d995ff7778ee32e94f83f8 [diff] | |
| parent | 82fe912d84c5a135d6521aeb80eb8767c8d8053a [diff] |
Merge "Fix out/soong/Android-<>.mk reproducibility" am: 2e93eb702d am: 5ba520122b am: 82fe912d84 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1353442 Change-Id: I221c8c488a7e05657316c678c42c8e0341e2a936
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 }