Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a4122a4 authored by Dan Albert's avatar Dan Albert
Browse files

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 3a360a73)
parent 1af02e61

core/cxx_stl_setup.mk

+2 −12
Original line number Diff line number Diff line
@@ -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