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

Move setting of link type properties to linkPropertyInfo am: f68f85a3ca am: c64e43dcd3

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

Change-Id: I7a19cd07f22d5e55553f0deb436c1cb219a0dd9f
This commit is contained in:
Paul Duffin
2021-09-16 08:47:41 +00:00
committed by Automerger Merge Worker
parent 535abf1d28 c64e43dcd3
commit b03c953d56
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sdk/update.go
View File

@@ -1608,8 +1608,7 @@ func (archInfo *archTypeSpecificInfo) addToPropertySet(ctx *memberContext, archP
addSdkMemberPropertiesToSet(ctx, archInfo.Properties, archTypePropertySet) addSdkMemberPropertiesToSet(ctx, archInfo.Properties, archTypePropertySet)
for _, linkInfo := range archInfo.linkInfos { for _, linkInfo := range archInfo.linkInfos {
linkPropertySet := archTypePropertySet.AddPropertySet(linkInfo.linkType) linkInfo.addToPropertySet(ctx, archTypePropertySet)
addSdkMemberPropertiesToSet(ctx, linkInfo.Properties, linkPropertySet)
} }
} }
@@ -1640,6 +1639,11 @@ func newLinkSpecificInfo(ctx android.SdkMemberContext, linkType string, variantP
return linkInfo 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 { func (l *linkTypeSpecificInfo) String() string {
return fmt.Sprintf("LinkType{%s}", l.linkType) return fmt.Sprintf("LinkType{%s}", l.linkType)
} }