diff --git a/android/apex.go b/android/apex.go index 823afbb11..5dcf73bc6 100644 --- a/android/apex.go +++ b/android/apex.go @@ -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 } diff --git a/cc/cc_test.go b/cc/cc_test.go index ebe543eaf..787669c75 100644 --- a/cc/cc_test.go +++ b/cc/cc_test.go @@ -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 {