StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow an sdk member type not to provide a bp property

Browse Source 
Bug: 181569894
Test: m nothing
Change-Id: I7e98f14cb377683457fba32fd05d6c614f78ffeb
This commit is contained in:
Paul Duffin
2021-05-11 00:31:38 +01:00
parent 0d4ed0ac56
commit 1308205638
3 changed files with 52 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sdk/update.go
View File

@@ -513,15 +513,19 @@ func (s *sdk) collateSnapshotModuleInfo(ctx android.BaseModuleContext, sdkVarian
}
combined := sdkVariantToCombinedProperties[memberVariantDep.sdkVariant]
memberTypeProperty := s.memberListProperty(memberVariantDep.memberType)
memberListProperty := s.memberListProperty(memberVariantDep.memberType)
memberName := ctx.OtherModuleName(memberVariantDep.variant)
if memberListProperty.getter == nil {
continue
}
// Append the member to the appropriate list, if it is not already present in the list.
memberList := memberTypeProperty.getter(combined.dynamicProperties)
memberList := memberListProperty.getter(combined.dynamicProperties)
if !android.InList(memberName, memberList) {
memberList = append(memberList, memberName)
}
memberTypeProperty.setter(combined.dynamicProperties, memberList)
memberListProperty.setter(combined.dynamicProperties, memberList)
}
return list
@@ -573,6 +577,9 @@ func (s *sdk) addSnapshotPropertiesToPropertySet(builder *snapshotBuilder, prope
dynamicMemberTypeListProperties := combined.dynamicProperties
for _, memberListProperty := range s.memberListProperties() {
if memberListProperty.getter == nil {
continue
}
names := memberListProperty.getter(dynamicMemberTypeListProperties)
if len(names) > 0 {
propertySet.AddProperty(memberListProperty.propertyName(), builder.versionedSdkMemberNames(names, false))