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

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

Merge "Using stlport_static or c++_static requires libdl."

parents 7f4eadef a81e1b7f

core/binary.mk

+2 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ ifdef LOCAL_SDK_VERSION 
    my_system_shared_libraries += libstdc++

    ifeq (stlport_static,$(LOCAL_NDK_STL_VARIANT))

      my_ndk_stl_static_lib := $(my_ndk_source_root)/cxx-stl/stlport/libs/$(my_cpu_variant)/libstlport_static.a

      my_ldlibs += -ldl

    else

      my_ndk_stl_shared_lib_fullpath := $(my_ndk_source_root)/cxx-stl/stlport/libs/$(my_cpu_variant)/libstlport_shared.so

      my_ndk_stl_shared_lib := -lstlport_shared
@@ -142,6 +143,7 @@ ifdef LOCAL_SDK_VERSION 
                               $(my_ndk_source_root)/android/support/include

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

      my_ndk_stl_static_lib := $(my_ndk_source_root)/cxx-stl/llvm-libc++/libs/$(my_cpu_variant)/libc++_static.a

      my_ldlibs += -ldl

    else

      my_ndk_stl_shared_lib_fullpath := $(my_ndk_source_root)/cxx-stl/llvm-libc++/libs/$(my_cpu_variant)/libc++_shared.so

      my_ndk_stl_shared_lib := -lc++_shared