Merge "Using stlport_static or c++_static requires libdl."
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user