diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-16 21:18:15 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-10-16 21:18:15 -0700 |
| commit | 93e8cf71fc85e6d5a625e7e64dc27e056af764ee (patch) | |
| tree | c75ee09f60f37a43689d0c9d183f28254652de3e /core/cxx_stl_setup.mk | |
| parent | 4e3e9ffbf314500d303724aefbddf1b89094cfd8 (diff) | |
| download | build-93e8cf71fc85e6d5a625e7e64dc27e056af764ee.zip build-93e8cf71fc85e6d5a625e7e64dc27e056af764ee.tar.gz build-93e8cf71fc85e6d5a625e7e64dc27e056af764ee.tar.bz2 | |
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
Diffstat (limited to 'core/cxx_stl_setup.mk')
| -rw-r--r-- | core/cxx_stl_setup.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ 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 |