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

Commit a1374de3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Account for `LOCAL_NDK_VERSION` when packaging."

parents 4d9d191e 609fa6c0

core/install_jni_libs_internal.mk

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

ifeq (stlport_shared,$(LOCAL_NDK_STL_VARIANT))

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))

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



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