commit 799172d60d32feb1acba1a6867f3a9c39a999e5c
author Pirama Arumuga Nainar <pirama@google.com> Thu Mar 03 15:50:30 2016 -0800
committer Stephen Hines <srhines@google.com> Thu Mar 17 19:14:41 2016 -0700
tree cc686572cfe607383e49f556b69ebb748ceb7a14
parent dec793732650d7d4d5f66511ec59f04a451315fa

Update aosp/master compiler-rt for rebase to r256229

http://b/26987366

Change-Id: I0ca3d7d3f1b7926fcffcb5b467e79958de576437

lib/lsan/lsan_common.h

diff --git a/lib/lsan/lsan_common.h b/lib/lsan/lsan_common.h
index 4f9d24f..0dfd0d4 100644
--- a/lib/lsan/lsan_common.h
+++ b/lib/lsan/lsan_common.h
@@ -22,8 +22,8 @@
 #include "sanitizer_common/sanitizer_stoptheworld.h"
 #include "sanitizer_common/sanitizer_symbolizer.h"
 
-#if SANITIZER_LINUX && (defined(__x86_64__) || defined(__mips64)) \
-    && (SANITIZER_WORDSIZE == 64)
+#if (SANITIZER_LINUX && !SANITIZER_ANDROID) && (SANITIZER_WORDSIZE == 64) \
+     && (defined(__x86_64__) ||  defined(__mips64) ||  defined(__aarch64__))
 #define CAN_SANITIZE_LEAKS 1
 #else
 #define CAN_SANITIZE_LEAKS 0