summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 {