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

Commit 609fa6c0 authored by Dan Albert's avatar Dan Albert
Browse files

Account for `LOCAL_NDK_VERSION` when packaging. 

Previously an app built with `LOCAL_NDK_VERSION := r10` would still
be packaged with r11's library.

Test: make checkbuild
Change-Id: I1dcbd65057adaa1af605b9770283f7da994fc3cf
parent 80ad0df4

core/install_jni_libs_internal.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -32,10 +32,10 @@ endif 
endif

endif

ifeq (stlport_shared,$(LOCAL_NDK_STL_VARIANT))

ifeq (stlport_shared,$(LOCAL_NDK_STL_VARIANT))

my_jni_shared_libraries += \

my_jni_shared_libraries += \

    $(HISTORICAL_NDK_VERSIONS_ROOT)/current/sources/cxx-stl/stlport/libs/$(TARGET_$(my_2nd_arch_prefix)CPU_ABI)/libstlport_shared.so

    $(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources/cxx-stl/stlport/libs/$(TARGET_$(my_2nd_arch_prefix)CPU_ABI)/libstlport_shared.so

else ifeq (c++_shared,$(LOCAL_NDK_STL_VARIANT))

else ifeq (c++_shared,$(LOCAL_NDK_STL_VARIANT))

my_jni_shared_libraries += \

my_jni_shared_libraries += \

    $(HISTORICAL_NDK_VERSIONS_ROOT)/current/sources/cxx-stl/llvm-libc++/libs/$(TARGET_$(my_2nd_arch_prefix)CPU_ABI)/libc++_shared.so

    $(HISTORICAL_NDK_VERSIONS_ROOT)/$(LOCAL_NDK_VERSION)/sources/cxx-stl/llvm-libc++/libs/$(TARGET_$(my_2nd_arch_prefix)CPU_ABI)/libc++_shared.so

endif

endif





# Set the abi directory used by the local JNI shared libraries.

# Set the abi directory used by the local JNI shared libraries.