tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes I91063ebb,Id859723b am: 12d170dc2a

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2565920

Change-Id: I4fc0a12816a8728d1f23ea6cffd2068f026134e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Spandan Das 2023-04-28 00:34:39 +00:00 committed by Automerger Merge Worker
commit 8932cfa2b5
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/apex.go
View file

@ -513,9 +513,8 @@ func (m *ApexModuleBase) checkApexAvailableProperty(mctx BaseModuleContext) {
// exactly the same set of APEXes (and platform), i.e. if their apex_available
// properties have the same elements.
func AvailableToSameApexes(mod1, mod2 ApexModule) bool {
// Use CopyOf to prevent non-determinism (b/275313114#comment1)
mod1ApexAvail := SortedUniqueStrings(CopyOf(mod1.apexModuleBase().ApexProperties.Apex_available))
mod2ApexAvail := SortedUniqueStrings(CopyOf(mod2.apexModuleBase().ApexProperties.Apex_available))
mod1ApexAvail := SortedUniqueStrings(mod1.apexModuleBase().ApexProperties.Apex_available)
mod2ApexAvail := SortedUniqueStrings(mod2.apexModuleBase().ApexProperties.Apex_available)
if len(mod1ApexAvail) != len(mod2ApexAvail) {
return false
}

9
android/util.go
View file

@ -26,7 +26,11 @@ import (
// CopyOf returns a new slice that has the same contents as s.
func CopyOf(s []string) []string {
return append([]string(nil), s...)
// If the input is nil, return nil and not an empty list
if s == nil {
return s
}
return append([]string{}, s...)
}
// Concat returns a new slice concatenated from the two input slices. It does not change the input
@ -276,6 +280,8 @@ func RemoveFromList(s string, list []string) (bool, []string) {
// FirstUniqueStrings returns all unique elements of a slice of strings, keeping the first copy of
// each. It modifies the slice contents in place, and returns a subslice of the original slice.
func FirstUniqueStrings(list []string) []string {
// Do not moodify the input in-place, operate on a copy instead.
list = CopyOf(list)
// 128 was chosen based on BenchmarkFirstUniqueStrings results.
if len(list) > 128 {
return firstUniqueStringsMap(list)
@ -332,6 +338,7 @@ func LastUniqueStrings(list []string) []string {
// SortedUniqueStrings returns what the name says
func SortedUniqueStrings(list []string) []string {
// FirstUniqueStrings creates a copy of `list`, so the input remains untouched.
unique := FirstUniqueStrings(list)
sort.Strings(unique)
return unique

8
android/util_test.go
View file

@ -381,6 +381,14 @@ func TestRemoveFromList(t *testing.T) {
}
}
func TestCopyOfEmptyAndNil(t *testing.T) {
emptyList := []string{}
copyOfEmptyList := CopyOf(emptyList)
AssertBoolEquals(t, "Copy of an empty list should be an empty list and not nil", true, copyOfEmptyList != nil)
copyOfNilList := CopyOf(nil)
AssertBoolEquals(t, "Copy of a nil list should be a nil list and not an empty list", true, copyOfNilList == nil)
}
func ExampleCopyOf() {
a := []string{"1", "2", "3"}
b := CopyOf(a)