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

Commit 7fde1f9c authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

Always link libdl with libc++ for the NDK. am: 2936a1e8 

am: ec6223ec

Change-Id: I18fb4af4cd80609ba7bec3d23509df3d3cb6ecf0
parents ee20a350 ec6223ec

core/binary.mk

+2 −2
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ ifdef LOCAL_SDK_VERSION 
    ifneq (,$(filter r10 r11,$(LOCAL_NDK_VERSION)))

      ifeq (c++_static,$(LOCAL_NDK_STL_VARIANT))

        my_ndk_stl_static_lib := $(my_libcxx_libdir)/libc++_static.a

        my_ldlibs += -ldl

      else

        my_ndk_stl_shared_lib_fullpath := $(my_libcxx_libdir)/libc++_shared.so

      endif
@@ -225,7 +224,6 @@ ifdef LOCAL_SDK_VERSION 
        my_ndk_stl_static_lib := \

          $(my_libcxx_libdir)/libc++_static.a \

          $(my_libcxx_libdir)/libc++abi.a

        my_ldlibs += -ldl

      else

        my_ndk_stl_shared_lib_fullpath := $(my_libcxx_libdir)/libc++_shared.so

      endif
@@ -236,6 +234,8 @@ ifdef LOCAL_SDK_VERSION 
      endif

    endif



    my_ldlibs += -ldl



    my_ndk_stl_cppflags := -std=c++11

  else # LOCAL_NDK_STL_VARIANT is not c++_* either

  ifneq (,$(filter gnustl_%, $(LOCAL_NDK_STL_VARIANT)))