Use libstc++ for the name of bionic's STL.
It is libstdc++.so, after all, and the naming makes sense for the host
this way (since it also uses libstdc++).
Change-Id: If37ffa015f7967a928ea47a290363d7696c4ce35
diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index 02a41e5..c688088 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -14,7 +14,7 @@
# 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 @@
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
