Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18907025 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

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

* commit 'd1ddf299':
  asan: update condition to work with multiple SANITIZE_TARGET values.
parents 4ac51de8 d1ddf299

opengl/libs/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ ifneq ($(MAX_EGL_CACHE_SIZE),) 
  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