Merge "ART: Refactor intrinsics slow-paths"
diff --git a/dex2oat/Android.mk b/dex2oat/Android.mk
index 2c90623..3cfdc4c 100644
--- a/dex2oat/Android.mk
+++ b/dex2oat/Android.mk
@@ -21,7 +21,7 @@
 # tree). By disabling this module in SANITIZE_TARGET build, we keep the regular,
 # uninstrumented version of it.
 # Bug: 22233158
-ifneq (address,$(strip $(SANITIZE_TARGET)))
+ifeq (,$(filter address, $(SANITIZE_TARGET)))
 
 LOCAL_PATH := $(call my-dir)