Merge "Fix windows builds" am: 706ce019e2

am: b35ec87342 Change-Id: I1a450327e98ca951e45504cd18a00db046b53d11
2016-09-14 00:14:40 +00:00
parent 6e41798485 b35ec87342
commit 1cde6f8688
1 changed files with 6 additions and 2 deletions
--- a/android/arch.go
+++ b/android/arch.go
@@ -294,9 +294,13 @@ func ArchMutator(mctx BottomUpMutatorContext) {
 		if multilib == "" {
 			multilib = module.base().commonProperties.Default_multilib
 		}
-		prefer32 := false
-		if class == Device {
+		var prefer32 bool
+		switch class {
+		case Device:
 			prefer32 = mctx.AConfig().DevicePrefer32BitExecutables()
+		case HostCross:
+			// Windows builds always prefer 32-bit
+			prefer32 = true
 		}
 		targets, err := decodeMultilib(multilib, targets, prefer32)
 		if err != nil {