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

Commit d1ddf299 authored by Colin Cross's avatar Colin Cross
Browse files

resolved conflicts for 5b5c81c4 to stage-aosp-master 

Change-Id: I0be665105d46cb3b934cb00890822d4dfae18f64
parents 7944e8ad 5b5c81c4

opengl/libs/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ ifneq ($(MAX_EGL_CACHE_SIZE),) 
  LOCAL_CFLAGS += -DMAX_EGL_CACHE_SIZE=$(MAX_EGL_CACHE_SIZE)

  LOCAL_CFLAGS += -DMAX_EGL_CACHE_SIZE=$(MAX_EGL_CACHE_SIZE)

endif

endif





ifeq (address, $(strip $(SANITIZE_TARGET)))

ifneq ($(filter address,$(SANITIZE_TARGET)),)

  LOCAL_CFLAGS_32 += -DEGL_WRAPPER_DIR=\"/$(TARGET_COPY_OUT_DATA)/lib\"

  LOCAL_CFLAGS_32 += -DEGL_WRAPPER_DIR=\"/$(TARGET_COPY_OUT_DATA)/lib\"

  LOCAL_CFLAGS_64 += -DEGL_WRAPPER_DIR=\"/$(TARGET_COPY_OUT_DATA)/lib64\"

  LOCAL_CFLAGS_64 += -DEGL_WRAPPER_DIR=\"/$(TARGET_COPY_OUT_DATA)/lib64\"

endif

endif