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

Remove support for pre-r13 NDKs. 

We only have r16 checked in now.

Test: make native
Bug: None
Change-Id: I1600598cf86f803f9fdcf3fa5ada8d1871c98b65
This commit is contained in:
Dan Albert 2017-12-15 15:25:06 -08:00
parent e2ffc8b887
commit 3d1d1ead79
1 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
core/binary.mk
View File

@ -207,51 +207,26 @@ ifneq ($(LOCAL_SDK_VERSION),)
endif endif
else # LOCAL_NDK_STL_VARIANT is not stlport_* either else # LOCAL_NDK_STL_VARIANT is not stlport_* either
ifneq (,$(filter c++_%, $(LOCAL_NDK_STL_VARIANT))) ifneq (,$(filter c++_%, $(LOCAL_NDK_STL_VARIANT)))
# Pre-r11 NDKs used libgabi++ for libc++'s C++ ABI, but r11 and later use my_ndk_stl_include_path := \
# libc++abi. $(my_ndk_source_root)/cxx-stl/llvm-libc++/include
# my_ndk_stl_include_path += \
# r13 no longer has the inner directory as a side effect of just using $(my_ndk_source_root)/cxx-stl/llvm-libc++abi/include
# external/libcxx.
ifeq (r10,$(LOCAL_NDK_VERSION))
my_ndk_stl_include_path := \
$(my_ndk_source_root)/cxx-stl/llvm-libc++/libcxx/include
my_ndk_stl_include_path += \
$(my_ndk_source_root)/cxx-stl/llvm-libc++/gabi++/include
else ifeq (r11,$(LOCAL_NDK_VERSION))
my_ndk_stl_include_path := \
$(my_ndk_source_root)/cxx-stl/llvm-libc++/libcxx/include
my_ndk_stl_include_path += \
$(my_ndk_source_root)/cxx-stl/llvm-libc++abi/libcxxabi/include
else
my_ndk_stl_include_path := \
$(my_ndk_source_root)/cxx-stl/llvm-libc++/include
my_ndk_stl_include_path += \
$(my_ndk_source_root)/cxx-stl/llvm-libc++abi/include
endif
my_ndk_stl_include_path += $(my_ndk_source_root)/android/support/include my_ndk_stl_include_path += $(my_ndk_source_root)/android/support/include
my_libcxx_libdir := \ my_libcxx_libdir := \
$(my_ndk_source_root)/cxx-stl/llvm-libc++/libs/$(my_cpu_variant) $(my_ndk_source_root)/cxx-stl/llvm-libc++/libs/$(my_cpu_variant)
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_ndk_stl_static_lib := $(my_libcxx_libdir)/libc++_static.a $(my_libcxx_libdir)/libc++_static.a \
else $(my_libcxx_libdir)/libc++abi.a
my_ndk_stl_shared_lib_fullpath := $(my_libcxx_libdir)/libc++_shared.so
endif
else else
ifeq (c++_static,$(LOCAL_NDK_STL_VARIANT)) my_ndk_stl_shared_lib_fullpath := $(my_libcxx_libdir)/libc++_shared.so
my_ndk_stl_static_lib := \ endif
$(my_libcxx_libdir)/libc++_static.a \
$(my_libcxx_libdir)/libc++abi.a
else
my_ndk_stl_shared_lib_fullpath := $(my_libcxx_libdir)/libc++_shared.so
endif
my_ndk_stl_static_lib += $(my_libcxx_libdir)/libandroid_support.a my_ndk_stl_static_lib += $(my_libcxx_libdir)/libandroid_support.a
ifneq (,$(filter armeabi armeabi-v7a,$(my_cpu_variant))) ifneq (,$(filter armeabi armeabi-v7a,$(my_cpu_variant)))
my_ndk_stl_static_lib += $(my_libcxx_libdir)/libunwind.a my_ndk_stl_static_lib += $(my_libcxx_libdir)/libunwind.a
endif
endif endif
my_ldlibs += -ldl my_ldlibs += -ldl