From 93e8cf71fc85e6d5a625e7e64dc27e056af764ee Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Thu, 16 Oct 2014 21:18:15 -0700
Subject: [PATCH] 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
---
 core/cxx_stl_setup.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index 02a41e52c..c688088ba 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -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
-- 
2.11.0