summaryrefslogtreecommitdiff
path: root/build/codegen.go
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2016-09-09 15:48:19 +0100
committer Nicolas Geoffray <ngeoffray@google.com> 2016-09-09 16:21:32 +0100
commite52ac1563a93d00a8570a5b70c5353578abbda3f (patch)
tree9c9867a3e8657f9f52760e2d067deec802048cbd /build/codegen.go
parent3bac5443975cd6312e7c6282b94014db25f369d7 (diff)
64bits codegens need to drag their 32bits equivalent.
This to restore the previous (non-soong) build behavior. Change-Id: Ie93c18db5522b889a44106cbb25c2a87f9e4a882
Diffstat (limited to 'build/codegen.go')
-rw-r--r--build/codegen.go10
1 files changed, 9 insertions, 1 deletions
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 {