openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

am: 7fde1f9c6e

Change-Id: Ia0f0f06883dd420034a230dfaa6bd32092d87c51
This commit is contained in:
Dan Albert 2016-09-16 06:53:55 +00:00 committed by android-build-merger
parent 4fac69d7ca 7fde1f9c6e
commit 3f0f58a60b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/binary.mk
View File

@ -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)))