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

Commit 638ca85a authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

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

parents 715a6c4c e6d958ae

core/binary.mk

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



    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