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

Commit 19e4741d authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Use direct dependency on the JNI so files."

parents 5baea143 d358f826

core/install_jni_libs_internal.mk

+3 −2
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ ifneq ($(my_jni_shared_libraries),) 
my_jni_filenames := $(notdir $(my_jni_shared_libraries))

# Make sure the JNI libraries get installed

my_shared_library_path := $($(my_2nd_arch_prefix)TARGET_OUT$(partition_tag)_SHARED_LIBRARIES)

$(LOCAL_INSTALLED_MODULE) : | $(addprefix $(my_shared_library_path)/, $(my_jni_filenames))

# Do not use order-only dependency, because we want to rebuild the image if an jni is updated.

$(LOCAL_INSTALLED_MODULE) : $(addprefix $(my_shared_library_path)/, $(my_jni_filenames))



# Create symlink in the app specific lib path

ifdef LOCAL_POST_INSTALL_CMD
@@ -93,7 +94,7 @@ else # not my_embed_jni 
$(foreach lib, $(my_prebuilt_jni_libs), \

    $(eval $(call copy-one-file, $(lib), $(my_app_lib_path)/$(notdir $(lib)))))



$(LOCAL_INSTALLED_MODULE) : | $(addprefix $(my_app_lib_path)/, $(notdir $(my_prebuilt_jni_libs)))

$(LOCAL_INSTALLED_MODULE) : $(addprefix $(my_app_lib_path)/, $(notdir $(my_prebuilt_jni_libs)))

endif  # my_embed_jni

endif  # inner my_prebuilt_jni_libs

endif  # outer my_prebuilt_jni_libs