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

Remove SdkMemberType.FinalizeModule

Browse Source 
This was only being used to set the "stl" property for cc library sdk
member type and so that functionality was moved to AddPrebuiltModule()
and FinalizeModule was removed.

Required a few test changes to move the property to the correct
position in the generated module.

Bug: 142918168
Test: m nothing
Change-Id: If6400189833d4ff3285e7a7adf63a9b509e2a03b
This commit is contained in:
Paul Duffin
2020-03-11 18:42:08 +00:00
parent 438d379eb6
commit 0174d8d2c9
4 changed files with 28 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/library_sdk_member.go
View File

@@ -105,15 +105,12 @@ func (mt *librarySdkMemberType) AddPrebuiltModule(sdkModuleContext android.Modul
if sdkVersion != "" {
pbm.AddProperty("sdk_version", sdkVersion)
}
return pbm
}
func (mt *librarySdkMemberType) FinalizeModule(sdkModuleContext android.ModuleContext, builder android.SnapshotBuilder, member android.SdkMember, bpModule android.BpModule) {
ccModule := (member.Variants()[0]).(*Module)
stl := ccModule.stl.Properties.Stl
if stl != nil {
bpModule.AddProperty("stl", proptools.String(stl))
pbm.AddProperty("stl", proptools.String(stl))
}
return pbm
}
func (mt *librarySdkMemberType) CreateVariantPropertiesStruct() android.SdkMemberProperties {