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

Commit ec382da3 authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Record installed JNI libs in INSTALLED files."

parents 7307de5e 8b7ecc06

core/install_jni_libs_internal.mk

+6 −2
Original line number Original line Diff line number Diff line
@@ -51,7 +51,9 @@ my_jni_filenames := $(notdir $(my_jni_shared_libraries)) 
my_shared_library_path := $(call get_non_asan_path,\

my_shared_library_path := $(call get_non_asan_path,\

  $($(my_2nd_arch_prefix)TARGET_OUT$(partition_tag)_SHARED_LIBRARIES))

  $($(my_2nd_arch_prefix)TARGET_OUT$(partition_tag)_SHARED_LIBRARIES))

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

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

my_installed_library := $(addprefix $(my_shared_library_path)/, $(my_jni_filenames))

$(LOCAL_INSTALLED_MODULE) : $(my_installed_library)

ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_installed_library)





# Create symlink in the app specific lib path

# Create symlink in the app specific lib path

# Skip creating this symlink when running the second part of a target sanitization build.

# Skip creating this symlink when running the second part of a target sanitization build.
@@ -96,7 +98,9 @@ else # not my_embed_jni 
$(foreach lib, $(my_prebuilt_jni_libs), \

$(foreach lib, $(my_prebuilt_jni_libs), \

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

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

my_installed_library := $(addprefix $(my_app_lib_path)/, $(notdir $(my_prebuilt_jni_libs)))

$(LOCAL_INSTALLED_MODULE) : $(my_installed_library)

ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(my_installed_library)

endif  # my_embed_jni

endif  # my_embed_jni

endif  # inner my_prebuilt_jni_libs

endif  # inner my_prebuilt_jni_libs

endif  # outer my_prebuilt_jni_libs

endif  # outer my_prebuilt_jni_libs