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

Merge "Don't use libandroid_support post-21."

This commit is contained in:
Dan Albert 2018-11-28 16:19:01 +00:00 committed by Gerrit Code Review
parent 715a6c4c80 e6d958aed7
commit 638ca85aec
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/binary.mk
View File

@ -225,7 +225,6 @@ ifneq ($(LOCAL_SDK_VERSION),)
$(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)
@ -238,7 +237,13 @@ ifneq ($(LOCAL_SDK_VERSION),)
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 ($(my_ndk_api),current)
ifeq ($(call math_lt,$(my_ndk_api),21),true)
my_ndk_stl_include_path += $(my_ndk_source_root)/android/support/include
my_ndk_stl_static_lib += $(my_libcxx_libdir)/libandroid_support.a
endif
endif
ifneq (,$(filter armeabi armeabi-v7a,$(my_cpu_variant)))
my_ndk_stl_static_lib += $(my_libcxx_libdir)/libunwind.a
endif