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

Set compile_multilib for SDK snapshots for device.

Browse Source 
Previously compile_multilib was ignored for device and defaulted to
"both", which could lead to an internal inconsistency in the snapshot
if a member was 32- or 64-only.

This also implements common property optimisation for compile_multilib,
by adding a struct that can be extended to other properties in the
future.

Test: m nothing
Bug: 151303681
Change-Id: I3e96222858e5e755173aca03508a23c431977e2a
This commit is contained in:
Martin Stjernholm
2020-07-10 19:55:36 +01:00
parent 89238f4703
commit 4cfa2c692b
2 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
sdk/update.go
View File

@@ -323,19 +323,37 @@ func (s *sdk) buildSnapshot(ctx android.ModuleContext, sdkVariants []*sdk) andro
// Add properties common to all os types.
s.addMemberPropertiesToPropertySet(builder, snapshotModule, commonDynamicMemberProperties)
// Optimize other per-variant properties, besides the dynamic member lists.
type variantProperties struct {
Compile_multilib string `android:"arch_variant"`
}
var variantPropertiesContainers []propertiesContainer
variantToProperties := make(map[*sdk]*variantProperties)
for _, sdkVariant := range sdkVariants {
props := &variantProperties{
Compile_multilib: sdkVariant.multilibUsages.String(),
}
variantPropertiesContainers = append(variantPropertiesContainers, &dynamicMemberPropertiesContainer{sdkVariant, props})
variantToProperties[sdkVariant] = props
}
commonVariantProperties := variantProperties{}
extractor = newCommonValueExtractor(commonVariantProperties)
extractCommonProperties(ctx, extractor, &commonVariantProperties, variantPropertiesContainers)
if commonVariantProperties.Compile_multilib != "" && commonVariantProperties.Compile_multilib != "both" {
// Compile_multilib defaults to both so only needs to be set when it's
// specified and not both.
snapshotModule.AddProperty("compile_multilib", commonVariantProperties.Compile_multilib)
}
// Iterate over the os types in a fixed order.
targetPropertySet := snapshotModule.AddPropertySet("target")
for _, osType := range s.getPossibleOsTypes() {
if sdkVariant, ok := osTypeToMemberProperties[osType]; ok {
osPropertySet := targetPropertySet.AddPropertySet(sdkVariant.Target().Os.Name)
// Compile_multilib defaults to both and must always be set to both on the
// device and so only needs to be set when targeted at the host and is neither
// unspecified or both.
multilib := sdkVariant.multilibUsages
if (osType.Class == android.Host || osType.Class == android.HostCross) &&
multilib != multilibNone && multilib != multilibBoth {
osPropertySet.AddProperty("compile_multilib", multilib.String())
variantProps := variantToProperties[sdkVariant]
if variantProps.Compile_multilib != "" && variantProps.Compile_multilib != "both" {
osPropertySet.AddProperty("compile_multilib", variantProps.Compile_multilib)
}
s.addMemberPropertiesToPropertySet(builder, osPropertySet, sdkVariant.dynamicMemberTypeListProperties)