commit 492253742a6196e7cf86bb51c9ea63b9322a36a6
author Dan Albert <danalbert@google.com> Tue Jun 16 21:45:32 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 16 21:45:32 2015 +0000
tree 6fd3df014917b7a65e750e1b92de86b664ad2990
parent 88727a3c874ec2006eb5eafdf8bef155bbb9d63b
parent 3a059d2d89dd87690ccf4081097d8d069bb7f3c4

am 3a059d2d: am f35f66a8: Merge "Use new sanitizer option."

* commit '3a059d2d89dd87690ccf4081097d8d069bb7f3c4':
  Use new sanitizer option.

cmds/app_process/Android.mk

diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk
index 3599695..171809c 100644
--- a/cmds/app_process/Android.mk
+++ b/cmds/app_process/Android.mk
@@ -56,7 +56,7 @@
 LOCAL_MODULE_STEM_32 := app_process32
 LOCAL_MODULE_STEM_64 := app_process64
 
-LOCAL_ADDRESS_SANITIZER := true
+LOCAL_SANITIZE := address
 LOCAL_CLANG := true
 LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/asan