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

Commit 939e5a0f authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am a1e55c5f: Merge "Fix using libc++_static in dynamic binaries." 

* commit 'a1e55c5f':
  Fix using libc++_static in dynamic binaries.
parents dcec9d0e a1e55c5f

core/cxx_stl_setup.mk

+7 −1
Original line number Diff line number Diff line
@@ -50,11 +50,17 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),) 
    my_cflags += -D_USING_LIBCXX

    my_c_includes += external/libcxx/include



    # Note that the structure of this means that LOCAL_CXX_STL := libc++ will

    # use the static libc++ for static executables.

    ifeq ($(my_link_type),dynamic)

        ifeq ($(my_cxx_stl),libc++)

            my_shared_libraries += libc++

        else

            my_static_libraries += libc++_static

        endif

    else

        my_static_libraries += libc++_static

    endif



    ifdef LOCAL_IS_HOST_MODULE

        my_cppflags += -nostdinc++