commit 06f0a137dce58bf75576b0a2d0a5e7410dae919d
author Dan Albert <danalbert@google.com> Wed Jun 17 17:21:26 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 17 17:21:27 2015 +0000
tree 696b0faf1ccbd8d34b6ef664ebdd09154f391b08
parent 2a884eeff61c3e0302660660ccb174a52236910a
parent b32c0009a30098efbfb59a533bf3b213a3bbfb24

Merge "Remove LOCAL_ADDRESS_SANITIZER."

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index bb18695..9cff6ea 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -4,17 +4,6 @@
 
 my_sanitize := $(strip $(LOCAL_SANITIZE))
 
-# Keep compatibility for LOCAL_ADDRESS_SANITIZER until all targets have moved to
-# `LOCAL_SANITIZE := address`.
-ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true)
-  my_sanitize += address
-endif
-
-# And `LOCAL_SANITIZE := never`.
-ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),false)
-  my_sanitize := never
-endif
-
 # Don't apply sanitizers to NDK code.
 ifdef LOCAL_SDK_VERSION
   my_sanitize := never