From 731322a90d2a67429a3f083fb461fde7a7dbcd3b Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Tue, 1 Jul 2014 18:56:31 -0700 Subject: [PATCH] Fix partition_tag usage in install_jni_libs This was expanding to TARGET_VENDOR_OUT_SHARED_LIBRARIES which was empty. It should be expanding to TARGET_OUT_VENDOR_SHARED_LIBRARIES. Change-Id: I32fe22e3e0b91a6d41f6a09a33d3ce2e4061d078 --- 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 b50c21e26..eb90c500f 100644 --- a/core/install_jni_libs_internal.mk +++ b/core/install_jni_libs_internal.mk @@ -18,7 +18,7 @@ my_jni_shared_libraries := \ $(LOCAL_JNI_SHARED_LIBRARIES))) # App-specific lib path. -my_app_lib_path := $($(my_2nd_arch_prefix)TARGET$(partition_tag)_OUT_SHARED_LIBRARIES)/$(basename $(my_installed_module_stem)) +my_app_lib_path := $($(my_2nd_arch_prefix)TARGET_OUT$(partition_tag)_SHARED_LIBRARIES)/$(basename $(my_installed_module_stem)) my_extracted_jni_libs := ifdef my_embed_jni @@ -54,7 +54,7 @@ ifneq ($(my_jni_shared_libraries),) # The jni libaries will be installed to the system.img. my_jni_filenames := $(notdir $(my_jni_shared_libraries)) # Make sure the JNI libraries get installed -$(LOCAL_INSTALLED_MODULE) : | $(addprefix $($(my_2nd_arch_prefix)TARGET$(partition_tag)_OUT_SHARED_LIBRARIES)/, $(my_jni_filenames)) +$(LOCAL_INSTALLED_MODULE) : | $(addprefix $($(my_2nd_arch_prefix)TARGET_OUT$(partition_tag)_SHARED_LIBRARIES)/, $(my_jni_filenames)) # Create symlink in the app specific lib path ifdef LOCAL_POST_INSTALL_CMD