diff options
| author | Dan Albert <danalbert@google.com> | 2015-05-06 10:08:32 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-05-08 09:56:48 -0700 |
| commit | 0a4122a4f28b00e9e575c9aa6d6020ec40dd35ac (patch) | |
| tree | 0f53fa7f94a59b527ae312abf4dbcc0fbb69c16c /core/cxx_stl_setup.mk | |
| parent | 1af02e61165a989f206395eb7401a0f5316cae42 (diff) | |
| download | build-0a4122a4f28b00e9e575c9aa6d6020ec40dd35ac.tar.gz build-0a4122a4f28b00e9e575c9aa6d6020ec40dd35ac.tar.bz2 build-0a4122a4f28b00e9e575c9aa6d6020ec40dd35ac.zip | |
Disallow using stlport.
The only remaining users of stlport are vendor blobs. Prevent any new
users from using it.
Bug: http://b/15193147
Change-Id: I577a16c8c52e2c7d939c3b5026e18ad90e4b9f26
(cherry picked from commit 3a360a7353034be89cbcbb24296c7ae30e6b0ef2)
Diffstat (limited to 'core/cxx_stl_setup.mk')
| -rw-r--r-- | core/cxx_stl_setup.mk | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index da84bdd29..ce56610b8 100644 --- a/core/cxx_stl_setup.mk +++ b/core/cxx_stl_setup.mk @@ -76,18 +76,8 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) my_shared_libraries += libdl endif endif -else ifneq ($(filter $(my_cxx_stl),stlport stlport_static),) - ifndef LOCAL_IS_HOST_MODULE - my_c_includes += external/stlport/stlport bionic/libstdc++/include \ - bionic - ifeq ($(my_cxx_stl),stlport) - my_shared_libraries += libstdc++ libstlport - else - my_static_libraries += libstdc++ libstlport_static - endif - endif else ifeq ($(my_cxx_stl),ndk) - # Using an NDK STL. Handled farther up in this file. + # Using an NDK STL. Handled in binary.mk. ifndef LOCAL_IS_HOST_MODULE my_system_shared_libraries += libstdc++ endif @@ -106,5 +96,5 @@ else ifeq ($(my_cxx_stl),none) my_ldlibs += $($(my_prefix)$(HOST_OS)_$(my_link_type)_gcclibs) endif else - $(error $(my_cxx_stl) is not a supported STL.) + $(error $(LOCAL_PATH): $(LOCAL_MODULE): $(my_cxx_stl) is not a supported STL.) endif |