From e52ac1563a93d00a8570a5b70c5353578abbda3f Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 9 Sep 2016 15:48:19 +0100 Subject: 64bits codegens need to drag their 32bits equivalent. This to restore the previous (non-soong) build behavior. Change-Id: Ie93c18db5522b889a44106cbb25c2a87f9e4a882 --- build/codegen.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'build/codegen.go') diff --git a/build/codegen.go b/build/codegen.go index eb2c37d651..fde9420039 100644 --- a/build/codegen.go +++ b/build/codegen.go @@ -112,7 +112,15 @@ type codegenCustomizer struct { func defaultDeviceCodegenArches(ctx android.CustomizePropertiesContext) []string { arches := make(map[string]bool) for _, a := range ctx.DeviceConfig().Arches() { - arches[a.ArchType.String()] = true + s := a.ArchType.String() + arches[s] = true + if s == "arm64" { + arches["arm"] = true + } else if s == "mips64" { + arches["mips"] = true + } else if s == "x86_64" { + arches["x86"] = true + } } ret := make([]string, 0, len(arches)) for a := range arches { -- cgit v1.2.3-59-g8ed1b