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

Clean up the main module creation loop

Browse Source 
This change reorganizes the code within the main module creation loop
in preparation for delegating the work to separate types. It has been
split out into its own change to make it easier to review by keeping
the functional changes localized.

Renames the osTypeSpecificInfo archTypes field to archInfos as the
latter is more accurate.

Cleans up the arch variants handling:
1) Groups them by arch type to make them easier to process.
2) Fails fast when there is not exactly one variant per arch type as
   otherwise it results in a confusing failure later on.
3) Removes the commonArch flags and instead uses the fact that
   osInfo.archInfos is empty when the common architecture variant is
   available.

Cleans up the arch type specific property set handling.
1) Adds new archPropertySet variable to allow the choice of where the
   arch specific properties are added to be made alongside the choice
   of where the os specific properties are to be added.
2) Removes unnecessary check for commonArch around the loop to add
   properties from archInfos as the archInfos will be empty when the
   common architecture is present.

A number of other changes to make it easier to extract the code into
their own methods.

Test: m nothing
Bug: 142918168
Change-Id: I16a5fa79efff0d08c22916449eb46a5bd910723a
This commit is contained in:
Paul Duffin
2020-03-17 10:58:23 +00:00
parent d21a743f73
commit b44b33a621
1 changed files with 78 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
sdk/update.go
View File

@@ -794,10 +794,9 @@ type osTypeSpecificInfo struct {
baseInfo baseInfo
// The list of arch type specific info for this os type. // The list of arch type specific info for this os type.
archTypes []*archTypeSpecificInfo //
// Nil if there is one variant whose arch type is common
// True if the member has common arch variants for this os type. archInfos []*archTypeSpecificInfo
commonArch bool
} }
type archTypeSpecificInfo struct { type archTypeSpecificInfo struct {
@@ -819,18 +818,18 @@ func (s *sdk) createMemberSnapshot(sdkModuleContext android.ModuleContext, build
} }
osCount := len(variantsByOsType) osCount := len(variantsByOsType)
createVariantPropertiesStruct := func(os android.OsType) android.SdkMemberProperties { variantPropertiesFactory := func() android.SdkMemberProperties {
properties := memberType.CreateVariantPropertiesStruct() properties := memberType.CreateVariantPropertiesStruct()
base := properties.Base() base := properties.Base()
base.Os_count = osCount base.Os_count = osCount
base.Os = os
return properties return properties
} }
osTypeToInfo := make(map[android.OsType]*osTypeSpecificInfo) osTypeToInfo := make(map[android.OsType]*osTypeSpecificInfo)
// The set of properties that are common across all architectures and os types. // The set of properties that are common across all architectures and os types.
commonProperties := createVariantPropertiesStruct(android.CommonOS) commonProperties := variantPropertiesFactory()
commonProperties.Base().Os = android.CommonOS
// Create common value extractor that can be used to optimize the properties. // Create common value extractor that can be used to optimize the properties.
commonValueExtractor := newCommonValueExtractor(commonProperties) commonValueExtractor := newCommonValueExtractor(commonProperties)
@@ -844,63 +843,81 @@ func (s *sdk) createMemberSnapshot(sdkModuleContext android.ModuleContext, build
osInfo := &osTypeSpecificInfo{} osInfo := &osTypeSpecificInfo{}
osTypeToInfo[osType] = osInfo osTypeToInfo[osType] = osInfo
// Create a structure into which properties common across the architectures in osSpecificVariantPropertiesFactory := func() android.SdkMemberProperties {
// this os type will be stored. Add it to the list of os type specific yet properties := variantPropertiesFactory()
// architecture independent properties structs. properties.Base().Os = osType
osInfo.Properties = createVariantPropertiesStruct(osType) return properties
}
// Add the os specific properties to a list of os type specific yet architecture
// independent properties structs.
osInfo.Properties = osSpecificVariantPropertiesFactory()
osSpecificPropertiesList = append(osSpecificPropertiesList, osInfo.Properties) osSpecificPropertiesList = append(osSpecificPropertiesList, osInfo.Properties)
commonArch := false // Group the variants by arch type.
var variantsByArchName = make(map[string][]android.SdkAware)
var archTypes []android.ArchType
for _, variant := range osTypeVariants { for _, variant := range osTypeVariants {
var properties android.SdkMemberProperties
// Get the info associated with the arch type inside the os info.
archType := variant.Target().Arch.ArchType archType := variant.Target().Arch.ArchType
archTypeName := archType.Name
if archType.Name == "common" { if _, ok := variantsByArchName[archTypeName]; !ok {
// The arch type is common so populate the common properties directly. archTypes = append(archTypes, archType)
properties = osInfo.Properties
commonArch = true
} else {
archInfo := &archTypeSpecificInfo{archType: archType}
properties = createVariantPropertiesStruct(osType)
archInfo.Properties = properties
osInfo.archTypes = append(osInfo.archTypes, archInfo)
} }
properties.PopulateFromVariant(variant) variantsByArchName[archTypeName] = append(variantsByArchName[archTypeName], variant)
} }
if commonArch { if commonVariants, ok := variantsByArchName["common"]; ok {
if len(osTypeVariants) != 1 { if len(osTypeVariants) != 1 {
panic("Expected to only have 1 variant when arch type is common but found " + string(len(variants))) panic("Expected to only have 1 variant when arch type is common but found " + string(len(osTypeVariants)))
} }
// A common arch type only has one variant and its properties should be treated
// as common to the os type.
osInfo.Properties.PopulateFromVariant(commonVariants[0])
} else { } else {
var archPropertiesList []android.SdkMemberProperties // Create an arch specific info for each supported architecture type.
for _, archInfo := range osInfo.archTypes { for _, archType := range archTypes {
archPropertiesList = append(archPropertiesList, archInfo.Properties) archTypeName := archType.Name
}
commonValueExtractor.extractCommonProperties(osInfo.Properties, archPropertiesList) archVariants := variantsByArchName[archTypeName]
if len(archVariants) != 1 {
// Choose setting for compile_multilib that is appropriate for the arch variants supplied. panic(fmt.Errorf("expected one arch specific variant but found %d", len(variants)))
var multilib string
archVariantCount := len(osInfo.archTypes)
if archVariantCount == 2 {
multilib = "both"
} else if archVariantCount == 1 {
if strings.HasSuffix(osInfo.archTypes[0].archType.Name, "64") {
multilib = "64"
} else {
multilib = "32"
} }
}
osInfo.commonArch = commonArch // Create an arch specific info into which the variant properties can be copied.
osInfo.Properties.Base().Compile_multilib = multilib archInfo := &archTypeSpecificInfo{archType: archType}
// Create the properties into which the arch type specific properties will be
// added.
archInfo.Properties = osSpecificVariantPropertiesFactory()
archInfo.Properties.PopulateFromVariant(archVariants[0])
osInfo.archInfos = append(osInfo.archInfos, archInfo)
}
} }
var archPropertiesList []android.SdkMemberProperties
for _, archInfo := range osInfo.archInfos {
archPropertiesList = append(archPropertiesList, archInfo.Properties)
}
commonValueExtractor.extractCommonProperties(osInfo.Properties, archPropertiesList)
// Choose setting for compile_multilib that is appropriate for the arch variants supplied.
var multilib string
archVariantCount := len(osInfo.archInfos)
if archVariantCount == 2 {
multilib = "both"
} else if archVariantCount == 1 {
if strings.HasSuffix(osInfo.archInfos[0].archType.Name, "64") {
multilib = "64"
} else {
multilib = "32"
}
}
osInfo.Properties.Base().Compile_multilib = multilib
} }
// Extract properties which are common across all architectures and os types. // Extract properties which are common across all architectures and os types.
@@ -921,9 +938,10 @@ func (s *sdk) createMemberSnapshot(sdkModuleContext android.ModuleContext, build
} }
var osPropertySet android.BpPropertySet var osPropertySet android.BpPropertySet
var archPropertySet android.BpPropertySet
var archOsPrefix string var archOsPrefix string
if len(osTypeToInfo) == 1 { if osInfo.Properties.Base().Os_count == 1 {
// There is only one os type present in the variants sp don't bother // There is only one os type present in the variants so don't bother
// with adding target specific properties. // with adding target specific properties.
// Create a structure that looks like: // Create a structure that looks like:
@@ -939,6 +957,7 @@ func (s *sdk) createMemberSnapshot(sdkModuleContext android.ModuleContext, build
// } // }
// //
osPropertySet = bpModule osPropertySet = bpModule
archPropertySet = osPropertySet.AddPropertySet("arch")
// Arch specific properties need to be added to an arch specific section // Arch specific properties need to be added to an arch specific section
// within arch. // within arch.
@@ -957,6 +976,7 @@ func (s *sdk) createMemberSnapshot(sdkModuleContext android.ModuleContext, build
// } // }
// //
osPropertySet = targetPropertySet.AddPropertySet(osType.Name) osPropertySet = targetPropertySet.AddPropertySet(osType.Name)
archPropertySet = targetPropertySet
// Arch specific properties need to be added to an os and arch specific // Arch specific properties need to be added to an os and arch specific
// section prefixed with <os>_. // section prefixed with <os>_.
@@ -964,23 +984,15 @@ func (s *sdk) createMemberSnapshot(sdkModuleContext android.ModuleContext, build
} }
osInfo.Properties.AddToPropertySet(sdkModuleContext, builder, osPropertySet) osInfo.Properties.AddToPropertySet(sdkModuleContext, builder, osPropertySet)
if !osInfo.commonArch {
// Either add the arch specific sections into the target or arch sections
// depending on whether they will also be os specific.
var archPropertySet android.BpPropertySet
if archOsPrefix == "" {
archPropertySet = osPropertySet.AddPropertySet("arch")
} else {
archPropertySet = targetPropertySet
}
// Add arch (and possibly os) specific sections for each set of // Add arch (and possibly os) specific sections for each set of arch (and possibly
// arch (and possibly os) specific properties. // os) specific properties.
for _, av := range osInfo.archTypes { //
archTypePropertySet := archPropertySet.AddPropertySet(archOsPrefix + av.archType.Name) // The archInfos list will be empty if the os contains variants for the common
for _, archInfo := range osInfo.archInfos {
archTypePropertySet := archPropertySet.AddPropertySet(archOsPrefix + archInfo.archType.Name)
av.Properties.AddToPropertySet(sdkModuleContext, builder, archTypePropertySet) archInfo.Properties.AddToPropertySet(sdkModuleContext, builder, archTypePropertySet)
}
} }
} }
} }