diff options
Diffstat (limited to 'sdk/update.go')
| -rw-r--r-- | sdk/update.go | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/sdk/update.go b/sdk/update.go index 7bf5dea0a..ba63542a4 100644 --- a/sdk/update.go +++ b/sdk/update.go @@ -735,6 +735,24 @@ func (s *snapshotBuilder) AddPrebuiltModule(member android.SdkMember, moduleType } } + // Where available copy apex_available properties from the member. + if apexAware, ok := variant.(interface{ ApexAvailable() []string }); ok { + apexAvailable := apexAware.ApexAvailable() + if len(apexAvailable) == 0 { + // //apex_available:platform is the default. + 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) + + m.AddProperty("apex_available", apexAvailable) + } + deviceSupported := false hostSupported := false @@ -749,22 +767,6 @@ func (s *snapshotBuilder) AddPrebuiltModule(member android.SdkMember, moduleType addHostDeviceSupportedProperties(deviceSupported, hostSupported, m) - // Where available copy apex_available properties from the member. - if apexAware, ok := variant.(interface{ ApexAvailable() []string }); ok { - apexAvailable := apexAware.ApexAvailable() - - // Add in any baseline apex available settings. - apexAvailable = append(apexAvailable, apex.BaselineApexAvailable(member.Name())...) - - if len(apexAvailable) > 0 { - // Remove duplicates and sort. - apexAvailable = android.FirstUniqueStrings(apexAvailable) - sort.Strings(apexAvailable) - - m.AddProperty("apex_available", apexAvailable) - } - } - // Disable installation in the versioned module of those modules that are ever installable. if installable, ok := variant.(interface{ EverInstallable() bool }); ok { if installable.EverInstallable() { |