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

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

Browse Source 
am: 5c8b8c6d6e

Change-Id: Ibec412526fa2a1ac5176e190dee4531b8916dc06
This commit is contained in:
Colin Cross
2016-12-20 20:09:12 +00:00
committed by android-build-merger
parent 8b65b744ad 5c8b8c6d6e
commit be89a68cbb
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android/arch.go
View File

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