StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mark jni libs as REQUIRED by their app" am: 7270150164 am: 04fe384a31 am: fe6a129cb3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/939004

Change-Id: Ib01ccb135464401dad044acbbd3deb508a84cb44
This commit is contained in:
Treehugger Robot
2020-06-18 08:33:41 +00:00
committed by Automerger Merge Worker
parent 19ba278a63 fe6a129cb3
commit f5b4ce5d99
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/install_jni_libs_internal.mk
View File

@@ -57,9 +57,9 @@ else ifneq ($(my_jni_shared_libraries),) # not my_embed_jni
# Make sure the JNI libraries get installed # Make sure the JNI libraries get installed
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))
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 # 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.