From 50a8120f02574790a20a774c3faeea3bc95d15ce Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 17 Mar 2016 12:56:25 -0700 Subject: [PATCH] Remove support for device libstdc++ as stl Prevent platform modules from linking against libstdc++ as their STL implementation. NDK modules may still use libstdc++. Change-Id: I317c9bb90ca7d2e0c1f5770bbdff8075dfe3cc83 --- core/cxx_stl_setup.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index 0777645f5..b4ba7a269 100644 --- a/core/cxx_stl_setup.mk +++ b/core/cxx_stl_setup.mk @@ -105,11 +105,8 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) else ifeq ($(my_cxx_stl),ndk) # Using an NDK STL. Handled in binary.mk. 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 - my_c_includes += bionic/libstdc++/include - my_system_shared_libraries += libstdc++ + $(error $(LOCAL_PATH): $(LOCAL_MODULE): libstdc++ is not supported for device modules) else # Host builds will use the system C++. libc++ on Darwin, GNU libstdc++ everywhere else my_cppflags += $($(my_prefix)SYSTEMCPP_CPPFLAGS)