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

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

Merge "Use libstc++ for the name of bionic's STL."

parents fc82be6e 93e8cf71

core/cxx_stl_setup.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ ifeq ($(strip $(LOCAL_CXX_STL)),default) 
            # Platform code. Select the appropriate STL.

            # Platform code. Select the appropriate STL.

            my_cxx_stl := libc++

            my_cxx_stl := libc++

        else

        else

            my_cxx_stl := bionic

            my_cxx_stl := libstdc++

        endif

        endif

    else

    else

        my_cxx_stl := ndk

        my_cxx_stl := ndk
@@ -52,7 +52,7 @@ else ifeq ($(my_cxx_stl),ndk) 
    ifndef LOCAL_IS_HOST_MODULE

    ifndef LOCAL_IS_HOST_MODULE

        my_system_shared_libraries += libstdc++

        my_system_shared_libraries += libstdc++

    endif

    endif

else ifeq ($(my_cxx_stl),bionic)

else ifeq ($(my_cxx_stl),libstdc++)

    # Using bionic's basic libstdc++. Not actually an STL. Only around until the

    # Using bionic's basic libstdc++. Not actually an STL. Only around until the

    # tree is in good enough shape to not need it.

    # tree is in good enough shape to not need it.

    ifndef LOCAL_IS_HOST_MODULE

    ifndef LOCAL_IS_HOST_MODULE