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

Use libstc++ for the name of bionic's STL.

Browse source 
It is libstdc++.so, after all, and the naming makes sense for the host
this way (since it also uses libstdc++).

Change-Id: If37ffa015f7967a928ea47a290363d7696c4ce35
This commit is contained in:
Dan Albert 2014-10-16 21:18:15 -07:00
parent 4e3e9ffbf3
commit 93e8cf71fc
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