StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix windows builds" am: 706ce019e2

Browse Source 
am: b35ec87342

Change-Id: I1a450327e98ca951e45504cd18a00db046b53d11
This commit is contained in:
Colin Cross
2016-09-14 00:14:40 +00:00
committed by android-build-merger
parent 6e41798485 b35ec87342
commit 1cde6f8688
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/arch.go
View File

@@ -294,9 +294,13 @@ func ArchMutator(mctx BottomUpMutatorContext) {
if multilib == "" { if multilib == "" {
multilib = module.base().commonProperties.Default_multilib multilib = module.base().commonProperties.Default_multilib
} }
prefer32 := false var prefer32 bool
if class == Device { switch class {
case Device:
prefer32 = mctx.AConfig().DevicePrefer32BitExecutables() prefer32 = mctx.AConfig().DevicePrefer32BitExecutables()
case HostCross:
// Windows builds always prefer 32-bit
prefer32 = true
} }
targets, err := decodeMultilib(multilib, targets, prefer32) targets, err := decodeMultilib(multilib, targets, prefer32)
if err != nil { if err != nil {