diff options
| author | 2016-09-16 06:40:32 +0000 | |
|---|---|---|
| committer | 2016-09-16 06:40:32 +0000 | |
| commit | 7b351cadfcdaba68465af19cdcd2775d9bb56ab3 (patch) | |
| tree | 72149a169a6d4b144a9e922bd040eddef6b48fae | |
| parent | c6507670f2372a3cc5ba7c213091e2d644b5c86b (diff) | |
| parent | c28e4bcb1cbe76ac1bb90c8f38eb5240ca0c1386 (diff) | |
Merge changes from topics 'ndk-compiler-rt_extras', 'ndk-libc++-libdl'
* changes:
Use libcompiler-rt_extras with NDK builds.
Always link libdl with libc++ for the NDK.
| -rw-r--r-- | core/binary.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/binary.mk b/core/binary.mk index b9cff6555a..058c7e4804 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -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))) @@ -418,7 +418,7 @@ include $(BUILD_SYSTEM)/config_sanitizers.mk ifneq ($(LOCAL_NO_LIBCOMPILER_RT),true) # Add in libcompiler_rt for all regular device builds -ifeq (,$(LOCAL_SDK_VERSION)$(WITHOUT_LIBCOMPILER_RT)) +ifeq (,$(WITHOUT_LIBCOMPILER_RT)) my_static_libraries += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES) endif endif |