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

Commit f2bdac77 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Never use stlport on the host."

parents c131ec09 b49987e2

core/cxx_stl_setup.mk

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

        my_ldlibs += -lc -lm

    endif

    endif

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

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)

        ifeq ($(my_cxx_stl),stlport)

            my_shared_libraries += libstdc++ libstlport

            my_shared_libraries += libstdc++ libstlport

        else

        else

            my_static_libraries += libstdc++ libstlport_static

            my_static_libraries += libstdc++ libstlport_static

        endif

        endif

    endif

else ifeq ($(my_cxx_stl),ndk)

else ifeq ($(my_cxx_stl),ndk)

    # Using an NDK STL. Handled farther up in this file.

    # Using an NDK STL. Handled farther up in this file.

    ifndef LOCAL_IS_HOST_MODULE

    ifndef LOCAL_IS_HOST_MODULE