Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6574d50b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use copy of apex_available in AvailableToSameApexes" am: d7b50181 am:... 

Merge "Use copy of apex_available in AvailableToSameApexes" am: d7b50181 am: 7686f94d am: 93938123 am: 0804b656 am: a9b5b2bb

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



Change-Id: Iff972f0b0d735e56f6df6a5f9e0073d4f15200c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f5d3b437 a9b5b2bb

android/apex.go

+3 −2
Original line number Diff line number Diff line
@@ -515,8 +515,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

	}

cc/cc_test.go

+0 −3
Original line number Diff line number Diff line
@@ -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 {