Merge changes I4129c2a9,I9af06f81 am: 0bf4ea53f5 am: 56797fd547 am: 88b15818b5

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

Change-Id: I3f43bc39e8cc0ea9d37f6ae64ca7993446b084da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Spandan Das
2023-04-20 17:23:47 +00:00
committed by Automerger Merge Worker
2 changed files with 17 additions and 2 deletions

View File

@@ -356,9 +356,18 @@ func (m *ApexModuleBase) apexModuleBase() *ApexModuleBase {
return m
}
var (
availableToPlatformList = []string{AvailableToPlatform}
)
// Implements ApexModule
func (m *ApexModuleBase) ApexAvailable() []string {
return m.ApexProperties.Apex_available
aa := m.ApexProperties.Apex_available
if len(aa) > 0 {
return aa
}
// Default is availability to platform
return CopyOf(availableToPlatformList)
}
// Implements ApexModule