StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use libandroid_support post-21.

Browse Source 
Test: m checkbuild
Bug: http://b/119587551
Change-Id: If3a3556ad27e632778efda43da8384a40eedee5a
This commit is contained in:
Dan Albert
2018-11-15 11:33:21 -08:00
parent c47f2beef3
commit e6d958aed7
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/binary.mk
View File

@@ -201,7 +201,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)
@@ -214,7 +213,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