openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

* commit 'ec807a8cc10bf9d5f9aa5c6ecc0a0c980b673364':
  Use libstc++ for the name of bionic's STL.
This commit is contained in:
Dan Albert 2014-10-17 17:57:52 +00:00 committed by Android Git Automerger
parent 2799aacd62 ec807a8cc1
commit 79dac8791d
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. # Platform code. Select the appropriate STL.
my_cxx_stl := libc++ my_cxx_stl := libc++
else else
my_cxx_stl := bionic my_cxx_stl := libstdc++
endif endif
else else
my_cxx_stl := ndk my_cxx_stl := ndk
@ -52,7 +52,7 @@ else ifeq ($(my_cxx_stl),ndk)
ifndef LOCAL_IS_HOST_MODULE ifndef LOCAL_IS_HOST_MODULE
my_system_shared_libraries += libstdc++ my_system_shared_libraries += libstdc++
endif 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 # Using bionic's basic libstdc++. Not actually an STL. Only around until the
# tree is in good enough shape to not need it. # tree is in good enough shape to not need it.
ifndef LOCAL_IS_HOST_MODULE ifndef LOCAL_IS_HOST_MODULE