Merge "Remove apex_available allowlist" into main

This commit is contained in:
Treehugger Robot
2024-09-11 21:50:57 +00:00
committed by Gerrit Code Review
2 changed files with 1 additions and 73 deletions

View File

@@ -22,7 +22,6 @@ import (
"sort"
"strings"
"android/soong/apex"
"android/soong/cc"
"android/soong/java"
@@ -1137,9 +1136,6 @@ func (s *snapshotBuilder) AddPrebuiltModule(member android.SdkMember, moduleType
apexAvailable = []string{android.AvailableToPlatform}
}
// Add in any baseline apex available settings.
apexAvailable = append(apexAvailable, apex.BaselineApexAvailable(member.Name())...)
// Remove duplicates and sort.
apexAvailable = android.FirstUniqueStrings(apexAvailable)
sort.Strings(apexAvailable)