tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am b5ccb461: Merge "Select the correct target STL with USE_MINGW."

Browse source 
* commit 'b5ccb461ed50dec49a5bc0e6cdbe8ffd62080d7d':
  Select the correct target STL with USE_MINGW.
This commit is contained in:
Dan Albert 2015-05-05 21:49:40 +00:00 committed by Android Git Automerger
commit 7cfccda659
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/cxx_stl_setup.mk
View file

@ -8,16 +8,16 @@
ifeq ($(strip $(LOCAL_CXX_STL)),default)
ifndef LOCAL_SDK_VERSION
# Platform code. Select the appropriate STL.
ifndef USE_MINGW
my_cxx_stl := libc++
ifdef LOCAL_IS_HOST_MODULE
ifneq (,$(BUILD_HOST_static))
my_cxx_stl := libc++_static
endif
my_cxx_stl := libc++
ifdef LOCAL_IS_HOST_MODULE
ifneq (,$(BUILD_HOST_static))
my_cxx_stl := libc++_static
endif
ifdef USE_MINGW
# libc++ is not supported on mingw.
my_cxx_stl := libstdc++
endif
else
# libc++ is not supported on mingw.
my_cxx_stl := libstdc++
endif
else
my_cxx_stl := ndk