p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Treehugger Robot 2016-09-16 06:40:32 +00:00 committed by Gerrit Code Review
parent c6507670f2 c28e4bcb1c
commit 7b351cadfc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/binary.mk
View File

@ -216,7 +216,6 @@ ifdef LOCAL_SDK_VERSION
ifneq (,$(filter r10 r11,$(LOCAL_NDK_VERSION))) ifneq (,$(filter r10 r11,$(LOCAL_NDK_VERSION)))
ifeq (c++_static,$(LOCAL_NDK_STL_VARIANT)) ifeq (c++_static,$(LOCAL_NDK_STL_VARIANT))
my_ndk_stl_static_lib := $(my_libcxx_libdir)/libc++_static.a my_ndk_stl_static_lib := $(my_libcxx_libdir)/libc++_static.a
my_ldlibs += -ldl
else else
my_ndk_stl_shared_lib_fullpath := $(my_libcxx_libdir)/libc++_shared.so my_ndk_stl_shared_lib_fullpath := $(my_libcxx_libdir)/libc++_shared.so
endif endif
@ -225,7 +224,6 @@ ifdef LOCAL_SDK_VERSION
my_ndk_stl_static_lib := \ my_ndk_stl_static_lib := \
$(my_libcxx_libdir)/libc++_static.a \ $(my_libcxx_libdir)/libc++_static.a \
$(my_libcxx_libdir)/libc++abi.a $(my_libcxx_libdir)/libc++abi.a
my_ldlibs += -ldl
else else
my_ndk_stl_shared_lib_fullpath := $(my_libcxx_libdir)/libc++_shared.so my_ndk_stl_shared_lib_fullpath := $(my_libcxx_libdir)/libc++_shared.so
endif endif
@ -236,6 +234,8 @@ ifdef LOCAL_SDK_VERSION
endif endif
endif endif
my_ldlibs += -ldl
my_ndk_stl_cppflags := -std=c++11 my_ndk_stl_cppflags := -std=c++11
else # LOCAL_NDK_STL_VARIANT is not c++_* either else # LOCAL_NDK_STL_VARIANT is not c++_* either
ifneq (,$(filter gnustl_%, $(LOCAL_NDK_STL_VARIANT))) ifneq (,$(filter gnustl_%, $(LOCAL_NDK_STL_VARIANT)))
@ -418,7 +418,7 @@ include $(BUILD_SYSTEM)/config_sanitizers.mk
ifneq ($(LOCAL_NO_LIBCOMPILER_RT),true) ifneq ($(LOCAL_NO_LIBCOMPILER_RT),true)
# Add in libcompiler_rt for all regular device builds # 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) my_static_libraries += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)
endif endif
endif endif