Revert "Simplify arch target handling"
This reverts commit 6713fb26cbcadf525cd75e47d7d0cbc23d282b3e.
Change-Id: Ic473cea2563b0b37dc08b0bc5d3a0ac8c4b6afe6
diff --git a/android/paths.go b/android/paths.go
index 35ed180..910ebd2 100644
--- a/android/paths.go
+++ b/android/paths.go
@@ -629,7 +629,7 @@
}
outPaths = []string{"target", "product", ctx.AConfig().DeviceName(), partition}
} else {
- outPaths = []string{"host", ctx.Os().String() + "-x86"}
+ outPaths = []string{"host", ctx.HostType().String() + "-x86"}
}
if ctx.Debug() {
outPaths = append([]string{"debug"}, outPaths...)