commit dc941379272b92b4b151ae619a561a86ce13c1d4
author Dan Albert <danalbert@google.com> Mon May 04 18:17:52 2015 -0700
committer Ying Wang <wangying@google.com> Tue May 05 15:46:50 2015 -0700
tree 28a1094fc859d5b5367b3396a4453b814db129a1
parent 4824042356e780153153ac7aafa6ce6e1b8df7f2

Make Windows a non-multilib target.

We don't have a toolchain for 64-bit windows.

This allows running `USE_MINGW=1 mm` in a directory that has a host
module with LOCAL_MULTILIB := both.

Change-Id: I31f981b38fb80b0d6582bab0a4bd580a3c654c91

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 3bfcbe7..015cfee 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -255,6 +255,7 @@
 $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATE_LIBRARIES := $($(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_INTERMEDIATES)/lib
 $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_SHARED_LIBRARIES := $(HOST_OUT)/lib
 $(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_EXECUTABLES := $(HOST_OUT_EXECUTABLES)
+$(HOST_2ND_ARCH_VAR_PREFIX)HOST_OUT_JAVA_LIBRARIES := $(HOST_OUT_JAVA_LIBRARIES)
 
 # The default host library path.
 # It always points to the path where we build libraries in the default bitness.