diff options
| author | Colin Cross <ccross@android.com> | 2015-12-16 19:29:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-16 19:29:40 +0000 |
| commit | a3e4c4d3210cb4469de8eacd5c2c2143493b5a2d (patch) | |
| tree | 7bb78635ffc6c70c2b228770170b362d3bde99d6 | |
| parent | 27f3b7dc0b9d662e6e812aba807ca983fbee444b (diff) | |
| parent | a716addb5388810b11dc26a5165f00fdf7ba9513 (diff) | |
| download | build_soong-a3e4c4d3210cb4469de8eacd5c2c2143493b5a2d.tar.gz build_soong-a3e4c4d3210cb4469de8eacd5c2c2143493b5a2d.tar.bz2 build_soong-a3e4c4d3210cb4469de8eacd5c2c2143493b5a2d.zip | |
Merge "Support "." in cpu and arch variant names"
| -rw-r--r-- | common/arch.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/arch.go b/common/arch.go index 37f7c38e..1d7d0de7 100644 --- a/common/arch.go +++ b/common/arch.go @@ -581,7 +581,7 @@ func InitArchModule(m AndroidModule, return m, allProperties } -var dashToUnderscoreReplacer = strings.NewReplacer("-", "_") +var variantReplacer = strings.NewReplacer("-", "_", ".", "_") func (a *AndroidModuleBase) appendProperties(ctx AndroidBottomUpMutatorContext, dst, src interface{}, field, srcPrefix string) interface{} { @@ -660,7 +660,7 @@ func (a *AndroidModuleBase) setArchProperties(ctx AndroidBottomUpMutatorContext) // key: value, // }, // }, - v := dashToUnderscoreReplacer.Replace(arch.ArchVariant) + v := variantReplacer.Replace(arch.ArchVariant) if v != "" { field := proptools.FieldNameForProperty(v) prefix := "arch." + t.Name + "." + v @@ -673,7 +673,7 @@ func (a *AndroidModuleBase) setArchProperties(ctx AndroidBottomUpMutatorContext) // key: value, // }, // }, - c := dashToUnderscoreReplacer.Replace(arch.CpuVariant) + c := variantReplacer.Replace(arch.CpuVariant) if c != "" { field := proptools.FieldNameForProperty(c) prefix := "arch." + t.Name + "." + c |