diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-12-20 20:01:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-12-20 20:01:38 +0000 |
| commit | 5c8b8c6d6ee4a4611bfb0492104eef287bcc09d8 (patch) | |
| tree | d978dd1bfa3258ff448c039bf80f052249e24cfb | |
| parent | 6e2557fa8884bc61eb930ab28bbfcc27b8f38339 (diff) | |
| parent | 080163317321dc08a637da10e1339c10590c33cd (diff) | |
| download | build_soong-5c8b8c6d6ee4a4611bfb0492104eef287bcc09d8.tar.gz build_soong-5c8b8c6d6ee4a4611bfb0492104eef287bcc09d8.tar.bz2 build_soong-5c8b8c6d6ee4a4611bfb0492104eef287bcc09d8.zip | |
Merge "Do not duplicate arch properties when cpu variant == arch variant"
| -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: |