commit fe438c50579ac2d8ca5622dba3bf2dd9f6f987fe
author Dan Albert <danalbert@google.com> Tue Jun 16 21:35:50 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 16 21:35:50 2015 +0000
tree 993fcc487508645871697a4a185abcf64349f3f6
parent 13a62360c9654558f08cd880bc33f4996fbb9fe0
parent 3296cb3a71172fee0b1fed5ae13610cbea0b0a9b

am 3296cb3a: Merge "Use new sanitizer option."

* commit '3296cb3a71172fee0b1fed5ae13610cbea0b0a9b':
  Use new sanitizer option.

Android.mk

diff --git a/Android.mk b/Android.mk
index 959b73c..c010bd1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -63,7 +63,7 @@
 LOCAL_SRC_FILES_arm := $(my_src_files_arm)
 LOCAL_CFLAGS_arm64 := $(my_cflags_arm64)
 LOCAL_SRC_FILES_arm64 := $(my_src_files_arm)
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
 LOCAL_SHARED_LIBRARIES := libz
 LOCAL_MODULE:= libpng