commit 60e64af80999af600bd043d9f118a06073498df0
author Sharif Elcott <selcott@google.com> Fri Jul 20 04:19:11 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jul 20 04:19:11 2018 -0700
tree ccbdb5fe4be4c26d5010d4839e66f173f6f60210
parent 31d9b808cb6fc3935791245acb86991deb137834
parent 2909cfb57d73a2e4a52fc3d95a420bdac9a88f51

Merge "Added Address Sanitizer clang config for x86_64." am: f6658018f6 am: c1c8ec7a39
am: 2909cfb57d

Change-Id: I97d77a6dbdcffd0795085416438a99b341a96a25

core/clang/TARGET_x86_64.mk

diff --git a/core/clang/TARGET_x86_64.mk b/core/clang/TARGET_x86_64.mk
index 0d3ee3f..3161f84 100644
--- a/core/clang/TARGET_x86_64.mk
+++ b/core/clang/TARGET_x86_64.mk
@@ -3,3 +3,6 @@
 RS_COMPAT_TRIPLE := x86_64-linux-android
 
 TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-x86_64-android.a
+
+# Address sanitizer clang config
+ADDRESS_SANITIZER_LINKER := /system/bin/linker_asan64