diff options
| author | Colin Cross <ccross@android.com> | 2016-12-20 09:53:14 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-12-20 09:53:14 -0800 |
| commit | 080163317321dc08a637da10e1339c10590c33cd (patch) | |
| tree | b2fb54be4f28456a16790e90c1d9d112775a6e2a /android/arch.go | |
| parent | 35e39720686e47fb936d3b7b671d478132f71f81 (diff) | |
| download | build_soong-080163317321dc08a637da10e1339c10590c33cd.tar.gz build_soong-080163317321dc08a637da10e1339c10590c33cd.tar.bz2 build_soong-080163317321dc08a637da10e1339c10590c33cd.zip | |
Do not duplicate arch properties when cpu variant == arch variant
build/make/board/generic_mips/BoardConfig.mk sets
TARGET_CPU_VARIANT := TARGET_ARCH_VARIANT, which can cause the same
variant-specific properties to be applied twice.
Test: lunch aosp_mips-eng && mmma -j external/skia TARGET_ARCH_VARIANT=mips32r2dspr2-fp
Change-Id: Ie4abe804f8ce898bf89664ae749b9bc8ac3e649f
Diffstat (limited to 'android/arch.go')
| -rw-r--r-- | android/arch.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/android/arch.go b/android/arch.go index a0617308..df50afa0 100644 --- a/android/arch.go +++ b/android/arch.go @@ -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: |