commit 18907025a63030cc5f41c1c19b35593687cc6a3d
author Colin Cross <ccross@android.com> Sat Sep 19 19:55:53 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Sep 19 19:55:53 2015 +0000
tree df7aac540ef778e11f3984d69435f65b09cf9fb6
parent 4ac51de845d2b93a19b2e08a544d6800862807dd
parent d1ddf29901aef92e53e420e9937e9a4937569b9d

am d1ddf299: resolved conflicts for 5b5c81c4 to stage-aosp-master

* commit 'd1ddf29901aef92e53e420e9937e9a4937569b9d':
  asan: update condition to work with multiple SANITIZE_TARGET values.

opengl/libs/Android.mk

diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk
index 29749c0..7fb0f77 100644
--- a/opengl/libs/Android.mk
+++ b/opengl/libs/Android.mk
@@ -59,7 +59,7 @@
   LOCAL_CFLAGS += -DMAX_EGL_CACHE_SIZE=$(MAX_EGL_CACHE_SIZE)
 endif
 
-ifeq (address, $(strip $(SANITIZE_TARGET)))
+ifneq ($(filter address,$(SANITIZE_TARGET)),)
   LOCAL_CFLAGS_32 += -DEGL_WRAPPER_DIR=\"/$(TARGET_COPY_OUT_DATA)/lib\"
   LOCAL_CFLAGS_64 += -DEGL_WRAPPER_DIR=\"/$(TARGET_COPY_OUT_DATA)/lib64\"
 endif