Remove RPATH for AddressSanitizer.
RPATH was used in order for ASan executables to prefer ASan libraries under /data. Now ASan executables use a special loader (linker_asan), which implements this logic. RPATH is no longer needed. Change-Id: Ic7a39b022267b80bd0ce3e95a2e822eb308a1fba
This commit is contained in:
parent
2ff3ad9045
commit
bbd944a25d
|
@ -69,5 +69,4 @@ $(clang_2nd_arch_prefix)TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.p
|
|||
|
||||
# Address sanitizer clang config
|
||||
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-arm-android
|
||||
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RPATH := /data/vendor/lib:/$(TARGET_COPY_OUT_VENDOR)/lib:/data/lib
|
||||
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan
|
||||
|
|
|
@ -67,5 +67,4 @@ TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-aarch64-android.a
|
|||
|
||||
# Address sanitizer clang config
|
||||
ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-aarch64-android
|
||||
ADDRESS_SANITIZER_RPATH := /data/vendor/lib64:/$(TARGET_COPY_OUT_VENDOR)/lib64:/data/lib64
|
||||
ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan64
|
||||
|
|
|
@ -74,5 +74,4 @@ $(clang_2nd_arch_prefix)TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.p
|
|||
|
||||
# Address sanitizer clang config
|
||||
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan-i686-android
|
||||
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_RPATH := /data/vendor/lib:/$(TARGET_COPY_OUT_VENDOR)/lib:/data/lib
|
||||
$(clang_2nd_arch_prefix)ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan
|
||||
|
|
|
@ -117,7 +117,6 @@ ifneq ($(filter address,$(my_sanitize)),)
|
|||
$(my_shared_libraries) \
|
||||
$(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES)
|
||||
my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)
|
||||
my_ldflags += -Wl,-rpath,$($(LOCAL_2ND_ARCH_VAR_PREFIX)ADDRESS_SANITIZER_RPATH)
|
||||
|
||||
my_linker := $($(LOCAL_2ND_ARCH_VAR_PREFIX)ADDRESS_SANITIZER_LINKER)
|
||||
# Make sure linker_asan get installed.
|
||||
|
|
Loading…
Reference in New Issue