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

am 26707ca8: Merge "Use libstc++ for the name of bionic\'s STL."

Browse source 
* commit '26707ca8bb29b62252dd9d3d346f731f4fad2806':
  Use libstc++ for the name of bionic's STL.
This commit is contained in:
Dan Albert 2014-10-17 17:48:24 +00:00 committed by Android Git Automerger
commit fb77fe99b7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/cxx_stl_setup.mk
View file

@ -14,7 +14,7 @@ ifeq ($(strip $(LOCAL_CXX_STL)),default)
# Platform code. Select the appropriate STL.
my_cxx_stl := libc++
else
my_cxx_stl := bionic
my_cxx_stl := libstdc++
endif
else
my_cxx_stl := ndk
@ -52,7 +52,7 @@ else ifeq ($(my_cxx_stl),ndk)
ifndef LOCAL_IS_HOST_MODULE
my_system_shared_libraries += libstdc++
endif
else ifeq ($(my_cxx_stl),bionic)
else ifeq ($(my_cxx_stl),libstdc++)
# Using bionic's basic libstdc++. Not actually an STL. Only around until the
# tree is in good enough shape to not need it.
ifndef LOCAL_IS_HOST_MODULE