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

Commit eff6a850 authored by Vishwath Mohan's avatar Vishwath Mohan Committed by android-build-merger
Browse files

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

am: bbf833c7

Change-Id: I3c26812c7799f2757e642ca4c7a4a4a12d7c3449
parents b11e7370 bbf833c7

core/envsetup.mk

+6 −0
Original line number Diff line number Diff line
@@ -187,6 +187,12 @@ TARGET_COPY_OUT_OEM := oem 
TARGET_COPY_OUT_ODM := odm

TARGET_COPY_OUT_ROOT := root

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

# we don't know if the device wants to build a separate vendor.img

core/install_jni_libs_internal.mk

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ ifneq ($(my_jni_shared_libraries),) 
# The jni libaries will be installed to the system.img.

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)

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.

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