Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6d958ae authored by Dan Albert's avatar Dan Albert
Browse files

Don't use libandroid_support post-21. 

Test: m checkbuild
Bug: http://b/119587551
Change-Id: If3a3556ad27e632778efda43da8384a40eedee5a
parent c47f2bee

core/binary.mk

+7 −2
Original line number Diff line number Diff line
@@ -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



    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