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

Commit ee67d604 authored by Evgenii Stepanov's avatar Evgenii Stepanov Committed by android-build-merger
Browse files

Merge "Remove RPATH for AddressSanitizer." am: 18733b9b 

am: 778ad5bb

* commit '778ad5bb':
  Remove RPATH for AddressSanitizer.
parents b7d4e524 778ad5bb

core/clang/TARGET_arm.mk

+0 −1
Original line number Diff line number Diff line
@@ -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

core/clang/TARGET_arm64.mk

+0 −1
Original line number Diff line number Diff line
@@ -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

core/clang/TARGET_x86.mk

+0 −1
Original line number Diff line number Diff line
@@ -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

core/config_sanitizers.mk

+0 −1
Original line number Diff line number Diff line
@@ -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.