StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use copy of apex_available in AvailableToSameApexes"

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-25 17:27:00 +00:00
committed by Gerrit Code Review
parent 969e375d55 4e1bfa06e9
commit d7b50181d9
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/apex.go
View File

@@ -513,8 +513,9 @@ 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 {
mod1ApexAvail := SortedUniqueStrings(mod1.apexModuleBase().ApexProperties.Apex_available)
mod2ApexAvail := SortedUniqueStrings(mod2.apexModuleBase().ApexProperties.Apex_available)
// 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))
if len(mod1ApexAvail) != len(mod2ApexAvail) {
return false
}

3
cc/cc_test.go
View File

@@ -3578,9 +3578,6 @@ func TestVersionedStubs(t *testing.T) {
}
func TestStubsForLibraryInMultipleApexes(t *testing.T) {
// TODO(b/275313114): Test exposes non-determinism which should be corrected and the test
// reenabled.
t.Skip()
t.Parallel()
ctx := testCc(t, `
cc_library_shared {