commit 154089b7cad2a2578d95722a474feedda3226b18
author Colin Cross <ccross@android.com> Sat Sep 19 20:03:39 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Sep 19 20:03:39 2015 +0000
tree b555be4735de78ef6b08b53dd43ac15e5148d688
parent 113efbfb2b8b3a34eb6e35a4d1c4644fc3bc913b
parent 18907025a63030cc5f41c1c19b35593687cc6a3d

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

* commit '18907025a63030cc5f41c1c19b35593687cc6a3d':
  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