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

Commit c5fa7396 authored by Anton Hansson's avatar Anton Hansson Committed by Yo Chiang
Browse files

Mark jni libs as REQUIRED by their app 

This makes the dependencies of the jni lib .so appear in
product_target_FILES. Previously, only the jni lib .so
itself appeared, as an effect of being added to the
INSTALLED files of the app.

Bug: 129323707
Test: compare the output between `m dump-files` and installed-files.txt
Test: noop in terms of build artifacts
Change-Id: Ie391bb45ad7758e51368cabb1ecba5caeae2f09c
parent b5b25409

core/install_jni_libs_internal.mk

+2 −2
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ else ifneq ($(my_jni_shared_libraries),) # not my_embed_jni 
  # Make sure the JNI libraries get installed

  my_shared_library_path := $(call get_non_asan_path,\

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

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



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

  bit_suffix := $(if $(filter %64,$(TARGET_$(my_2nd_arch_prefix)ARCH)),:64,:32)

  ALL_MODULES.$(my_register_name).REQUIRED_FROM_TARGET += $(addsuffix $(bit_suffix),$(LOCAL_JNI_SHARED_LIBRARIES))



  # Create symlink in the app specific lib path

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