commit eccc461d0026583c94e598478d7903e7fcbee696
author Jiyong Park <jiyong@google.com> Mon Jul 13 19:19:27 2020 +0900
committer Jiyong Park <jiyong@google.com> Tue Aug 25 11:01:11 2020 +0900
tree c39e7ad449d5b6837ccfad94e4337dec9c71d882
parent 78439f466813bd93d2575e2c50aa2c81c85787ab

Fix HOST_CROSS_OUT

Previously, HOST_CROSS_OUT was defined with the assumption that
windows_x86 is the only supported OS/Arch. In preparatio for Linux/ARM
support, HOST_CROSS_OUT is now defined using HOST_CROSS_OS and
HOST_CROSS_ARCH.

Bug: 159685774
Test: m

Change-Id: I0831c2885db37c44af4fd47bab8481bc885b4b7e

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 167fed9..76e7dd3 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -328,7 +328,7 @@
 HOST_OUT := $(HOST_OUT_ROOT)/$(HOST_OS)-$(HOST_PREBUILT_ARCH)
 SOONG_HOST_OUT := $(SOONG_OUT_DIR)/host/$(HOST_OS)-$(HOST_PREBUILT_ARCH)
 
-HOST_CROSS_OUT := $(HOST_OUT_ROOT)/windows-$(HOST_PREBUILT_ARCH)
+HOST_CROSS_OUT := $(HOST_OUT_ROOT)/$(HOST_CROSS_OS)-$(HOST_CROSS_ARCH)
 
 .KATI_READONLY := HOST_OUT SOONG_HOST_OUT HOST_CROSS_OUT