diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-05-17 20:07:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-17 20:07:55 +0000 |
| commit | bbf833c7e118e245f790f6a5f19bd53fd31df0f5 (patch) | |
| tree | 675d83cad9a2de7f11c5f579aa2d63edbca3f12f | |
| parent | 2f4e8f46e47732c25337bd4f2e354e9e926bc69b (diff) | |
| parent | d4dbf7921de920266b1d0e35a1d4a41198f5cf04 (diff) | |
| download | build-n-iot-preview-4.tar.gz | |
Merge "Always use non-sanitized library locations for JNI."android-n-iot-preview-4n-iot-preview-4
| -rw-r--r-- | core/envsetup.mk | 6 | ||||
| -rw-r--r-- | core/install_jni_libs_internal.mk | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index ba9d7ebf3b..a734cc751e 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -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 diff --git a/core/install_jni_libs_internal.mk b/core/install_jni_libs_internal.mk index 3898dc90f4..0e92153663 100644 --- a/core/install_jni_libs_internal.mk +++ b/core/install_jni_libs_internal.mk @@ -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)) |