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

Merge changes I4129c2a9,I9af06f81 am: 0bf4ea53f5

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

Change-Id: I22ed8397dc756b4bf3da49b8b0ff4cd933bda310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Spandan Das 2023-04-20 16:10:02 +00:00 committed by Automerger Merge Worker
commit 56797fd547
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
android/apex.go
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

8
android/mutator.go
View file

@ -747,7 +747,13 @@ func ApexAvailableTags(mod Module) bazel.StringListAttribute {
// TODO(b/218841706): hidl_interface has the apex_available prop, but it's
// defined directly as a prop and not via ApexModule, so this doesn't
// pick those props up.
attr.Value = ConvertApexAvailableToTags(am.apexModuleBase().ApexAvailable())
apexAvailable := am.apexModuleBase().ApexAvailable()
// If a user does not specify apex_available in Android.bp, then soong provides a default.
// To avoid verbosity of BUILD files, remove this default from user-facing BUILD files.
if len(am.apexModuleBase().ApexProperties.Apex_available) == 0 {
apexAvailable = []string{}
}
attr.Value = ConvertApexAvailableToTags(apexAvailable)
}
return attr
}