From 609fa6c0c3f2fa92dc5ffa016866600ba3999816 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 8 Aug 2016 17:13:31 -0700 Subject: [PATCH] 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 --- core/install_jni_libs_internal.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/install_jni_libs_internal.mk b/core/install_jni_libs_internal.mk index 6136968c6..9f5d445e0 100644 --- a/core/install_jni_libs_internal.mk +++ b/core/install_jni_libs_internal.mk @@ -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.