Blacklist libc++ from windows host builds

It's not ready, and instead of each Android.mk doing this, do it in the
core build.

Change-Id: Ie80b17ffcde64e72c98d310ca986d4cf775c099e
This commit is contained in:
Dan Willemsen
2015-08-13 17:41:56 -07:00
parent 59c858fc94
commit 1ca3b70f84

View File

@@ -14,7 +14,7 @@ ifeq ($(strip $(LOCAL_CXX_STL)),default)
my_cxx_stl := libc++_static
endif
ifdef USE_MINGW
ifeq ($($(my_prefix)OS),windows)
# libc++ is not supported on mingw.
my_cxx_stl := libstdc++
endif
@@ -36,6 +36,14 @@ else
# the two options use different names for the STLs.
$(error $(LOCAL_PATH): $(LOCAL_MODULE): Must use LOCAL_NDK_STL_VARIANT rather than LOCAL_CXX_STL for NDK binaries)
endif
ifdef LOCAL_IS_HOST_MODULE
ifeq ($($(my_prefix)OS),windows)
ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
# libc++ is not supported on mingw.
my_cxx_stl := libstdc++
endif
endif
endif
endif
# Yes, this is actually what the clang driver does.