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

Merge "Always use non-sanitized library locations for JNI."

Browse Source
This commit is contained in:
Treehugger Robot
2017-05-17 20:07:53 +00:00
committed by Gerrit Code Review
parent 2f4e8f46e4 d4dbf7921d
commit bbf833c7e1
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/envsetup.mk
View File

@@ -187,6 +187,12 @@ TARGET_COPY_OUT_OEM := oem
TARGET_COPY_OUT_ODM := odm TARGET_COPY_OUT_ODM := odm
TARGET_COPY_OUT_ROOT := root TARGET_COPY_OUT_ROOT := root
TARGET_COPY_OUT_RECOVERY := recovery TARGET_COPY_OUT_RECOVERY := recovery
# Returns the non-sanitized version of the path provided in $1.
define get_non_asan_path
$(patsubst $(PRODUCT_OUT)/$(TARGET_COPY_OUT_ASAN)/%,$(PRODUCT_OUT)/%,$1)
endef
########################################### ###########################################
# Define TARGET_COPY_OUT_VENDOR to a placeholder, for at this point # Define TARGET_COPY_OUT_VENDOR to a placeholder, for at this point
# we don't know if the device wants to build a separate vendor.img # we don't know if the device wants to build a separate vendor.img

3
core/install_jni_libs_internal.mk
View File

@@ -54,7 +54,8 @@ ifneq ($(my_jni_shared_libraries),)
# The jni libaries will be installed to the system.img. # The jni libaries will be installed to the system.img.
my_jni_filenames := $(notdir $(my_jni_shared_libraries)) my_jni_filenames := $(notdir $(my_jni_shared_libraries))
# Make sure the JNI libraries get installed # Make sure the JNI libraries get installed
my_shared_library_path := $($(my_2nd_arch_prefix)TARGET_OUT$(partition_tag)_SHARED_LIBRARIES) my_shared_library_path := $(call get_non_asan_path,\
$($(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)) $(LOCAL_INSTALLED_MODULE) : $(addprefix $(my_shared_library_path)/, $(my_jni_filenames))