commit b948856fea11138044dbebe2925ac5d58ad827e2
author Christopher Ferris <cferris@google.com> Wed Jun 24 16:42:28 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 24 16:42:28 2015 +0000
tree bb4fd0fac38738ee842a3fd81bcdfc3527f6db83
parent 98b53a5d7a66867a60f5e21c2e3045960d024c47
parent 2528beeca06ecef6de927c93816f9481dc2be74d

am 2528beec: Skip stack and empty maps when reading load base.

* commit '2528beeca06ecef6de927c93816f9481dc2be74d':
  Skip stack and empty maps when reading load base.

Android.build.mk

diff --git a/Android.build.mk b/Android.build.mk
index afb78ff..fc9324b 100644
--- a/Android.build.mk
+++ b/Android.build.mk
@@ -107,7 +107,7 @@
 LOCAL_SRC_FILES_arm64 := \
     $(subst src/arm64,src/aarch64,$(LOCAL_SRC_FILES_arm64))
 
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
 
 ifeq ($(libunwind_build_type),target)
   include $(BUILD_$(libunwind_build_target))