From 2a6e3b00b0c29cfd6ed9aa972cc0d45202454bb9 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Mon, 6 Nov 2017 11:03:28 -0800
Subject: [PATCH] Turn off Windows builds during BUILD_HOST_static

We can only create static host binaries for Linux, so if static host
binaries are requested, turn off Windows cross-builds.

Test: m zipalign BUILD_HOST_static=1
Change-Id: Ib37508d4b502cd56dad535cb6eab648f625486c6
---
 core/envsetup.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 8749a326c8..ddf903c36b 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -124,11 +124,13 @@ BUILD_OS := $(HOST_OS)
 HOST_CROSS_OS :=
 # We can cross-build Windows binaries on Linux
 ifeq ($(HOST_OS),linux)
+ifeq ($(BUILD_HOST_static),)
 HOST_CROSS_OS := windows
 HOST_CROSS_ARCH := x86
 HOST_CROSS_2ND_ARCH := x86_64
 2ND_HOST_CROSS_IS_64_BIT := true
 endif
+endif
 
 ifeq ($(HOST_OS),)
 $(error Unable to determine HOST_OS from uname -sm: $(UNAME)!)