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

Commit b49987e2 authored by Dan Albert's avatar Dan Albert
Browse files

Never use stlport on the host. 

LOCAL_CXX_STL := stlport should just use the default STL on the host.

Change-Id: Iede1b2d8884e237a10e000e5835addb768c8f78d
parent c131ec09

core/cxx_stl_setup.mk

+8 −5
Original line number Diff line number Diff line
@@ -38,12 +38,15 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) 
        my_ldlibs += -lc -lm

    endif

else ifneq ($(filter $(my_cxx_stl),stlport stlport_static),)

    my_c_includes += external/stlport/stlport bionic/libstdc++/include bionic

    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.

    ifndef LOCAL_IS_HOST_MODULE