From f68f85a3cac3214a610ec716cab089ccc5aebf41 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 9 Sep 2021 16:11:42 +0100 Subject: [PATCH] Move setting of link type properties to linkPropertyInfo Bug: 195754365 Test: m nothing Change-Id: Ica90a42cd8e4a79251271164f137dcdf60b3bd55 --- sdk/update.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sdk/update.go b/sdk/update.go index a998f424a..254b7ab85 100644 --- a/sdk/update.go +++ b/sdk/update.go @@ -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) }