Merge "Do not duplicate arch properties when cpu variant == arch variant"

This commit is contained in:
Treehugger Robot
2016-12-20 20:01:38 +00:00
committed by Gerrit Code Review

View File

@@ -610,11 +610,13 @@ func (a *ModuleBase) setArchProperties(ctx BottomUpMutatorContext) {
// key: value, // key: value,
// }, // },
// }, // },
c := variantReplacer.Replace(arch.CpuVariant) if arch.CpuVariant != arch.ArchVariant {
if c != "" { c := variantReplacer.Replace(arch.CpuVariant)
field := proptools.FieldNameForProperty(c) if c != "" {
prefix := "arch." + t.Name + "." + c field := proptools.FieldNameForProperty(c)
a.appendProperties(ctx, genProps, archStruct, field, prefix) prefix := "arch." + t.Name + "." + c
a.appendProperties(ctx, genProps, archStruct, field, prefix)
}
} }
// Handle arch-feature-specific properties in the form: // Handle arch-feature-specific properties in the form: