Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f68f85a3 authored by Paul Duffin's avatar Paul Duffin
Browse files

Move setting of link type properties to linkPropertyInfo 

Bug: 195754365
Test: m nothing
Change-Id: Ica90a42cd8e4a79251271164f137dcdf60b3bd55
parent b1a12462

sdk/update.go

+6 −2
Original line number Diff line number Diff line
@@ -1608,8 +1608,7 @@ func (archInfo *archTypeSpecificInfo) addToPropertySet(ctx *memberContext, archP 
	addSdkMemberPropertiesToSet(ctx, archInfo.Properties, archTypePropertySet)



	for _, linkInfo := range archInfo.linkInfos {

		linkPropertySet := archTypePropertySet.AddPropertySet(linkInfo.linkType)

		addSdkMemberPropertiesToSet(ctx, linkInfo.Properties, linkPropertySet)

		linkInfo.addToPropertySet(ctx, archTypePropertySet)

	}

}
@@ -1640,6 +1639,11 @@ func newLinkSpecificInfo(ctx android.SdkMemberContext, linkType string, variantP 
	return linkInfo

}



func (l *linkTypeSpecificInfo) addToPropertySet(ctx *memberContext, propertySet android.BpPropertySet) {

	linkPropertySet := propertySet.AddPropertySet(l.linkType)

	addSdkMemberPropertiesToSet(ctx, l.Properties, linkPropertySet)

}



func (l *linkTypeSpecificInfo) String() string {

	return fmt.Sprintf("LinkType{%s}", l.linkType)

}