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

Commit 88a8ce69 authored by Dan Albert's avatar Dan Albert
Browse files

Select the correct target STL with USE_MINGW. 

The previous check tested against USE_MINGW even for target builds.
Hadn't been a problem because people don't typically set USE_MINGW
directly.

Change-Id: I90fe0ea890c44917eb29dd02d7c7f76c19e7fbd6
parent b9a8aa63

core/cxx_stl_setup.mk

+9 −9
Original line number Diff line number Diff line
@@ -8,17 +8,17 @@ 
ifeq ($(strip $(LOCAL_CXX_STL)),default)

    ifndef LOCAL_SDK_VERSION

        # Platform code. Select the appropriate STL.

        ifndef USE_MINGW

        my_cxx_stl := libc++

        ifdef LOCAL_IS_HOST_MODULE

            ifneq (,$(BUILD_HOST_static))

                my_cxx_stl := libc++_static

            endif

            endif

        else



            ifdef USE_MINGW

                # libc++ is not supported on mingw.

                my_cxx_stl := libstdc++

            endif

        endif

    else

        my_cxx_stl := ndk

    endif