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

Merge "Use copy of apex_available in AvailableToSameApexes" am: d7b50181d9 am: 7686f94d20

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

Change-Id: Ibac89d0ba824183cf010c26a6ad1892fe6a3e322
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-04-25 18:51:08 +00:00 committed by Automerger Merge Worker
commit 93938123f4
2 changed files with 3 additions and 5 deletions
Show stats 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 {