tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove support for pre-r13 NDKs."

Browse source 
am: 9d3270bd52

Change-Id: I49d1214fad8e8172d6c94cccf9fc559793b8cbad
This commit is contained in:
Dan Albert 2017-12-16 01:22:06 +00:00 committed by android-build-merger
commit 28cc8a9c83
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
else # LOCAL_NDK_STL_VARIANT is not stlport_* either
ifneq (,$(filter c++_%, $(LOCAL_NDK_STL_VARIANT)))
# Pre-r11 NDKs used libgabi++ for libc++'s C++ ABI, but r11 and later use
# libc++abi.
#
# r13 no longer has the inner directory as a side effect of just using
# 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)/cxx-stl/llvm-libc++/include
my_ndk_stl_include_path += \
$(my_ndk_source_root)/cxx-stl/llvm-libc++abi/include
my_ndk_stl_include_path += $(my_ndk_source_root)/android/support/include
my_libcxx_libdir := \
$(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))
my_ndk_stl_static_lib := $(my_libcxx_libdir)/libc++_static.a
else
my_ndk_stl_shared_lib_fullpath := $(my_libcxx_libdir)/libc++_shared.so
endif
ifeq (c++_static,$(LOCAL_NDK_STL_VARIANT))
my_ndk_stl_static_lib := \
$(my_libcxx_libdir)/libc++_static.a \
$(my_libcxx_libdir)/libc++abi.a
else
ifeq (c++_static,$(LOCAL_NDK_STL_VARIANT))
my_ndk_stl_static_lib := \
$(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_shared_lib_fullpath := $(my_libcxx_libdir)/libc++_shared.so
endif
my_ndk_stl_static_lib += $(my_libcxx_libdir)/libandroid_support.a
ifneq (,$(filter armeabi armeabi-v7a,$(my_cpu_variant)))
my_ndk_stl_static_lib += $(my_libcxx_libdir)/libunwind.a
endif
my_ndk_stl_static_lib += $(my_libcxx_libdir)/libandroid_support.a
ifneq (,$(filter armeabi armeabi-v7a,$(my_cpu_variant)))
my_ndk_stl_static_lib += $(my_libcxx_libdir)/libunwind.a
endif
my_ldlibs += -ldl