commit 52a9a8663eb254954dfc3781e6b4d1980d8b2ee4
author Dan Willemsen <dwillemsen@google.com> Tue Oct 11 15:59:04 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Fri Oct 14 17:34:43 2016 -0700
tree fb3cfc02c0ee7f9ee03f2ea51091eb101eb89a83
parent 8a767feb142d1cf2bdd8028857710394d938b5b1

Remove ASAN specialization

The linker will rewrite library paths when running with asan, there's no
reason to do this manually:

10-11 23:26:33.971  8789  8789 E linker  : linker_asan dlopen translating "/system/lib64/libEGL.so" -> "/data/lib64/libEGL.so"
10-11 23:26:34.061  8790  8790 E linker  : linker_asan dlopen translating "/system/lib/libEGL.so" -> "/data/lib/libEGL.so"

Test: Boot SANITIZE_TARGET=address aosp_flounder-eng
Change-Id: I3eb9935603b267c2aefe09d4f24410cbd673feb6

opengl/libs/Android.mk

diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk
index ceabf26..789b325 100644
--- a/opengl/libs/Android.mk
+++ b/opengl/libs/Android.mk
@@ -42,11 +42,6 @@
 LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
 LOCAL_CFLAGS += -fvisibility=hidden
 
-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
-
 LOCAL_REQUIRED_MODULES := $(egl.cfg_config_module)
 egl.cfg_config_module :=