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

Commit 4986a387 authored by Nick Kralevich's avatar Nick Kralevich
Browse files

resolved conflicts for merge of 4cbee7d2 to lmp-mr1-dev-plus-aosp

Change-Id: Ibed2d1ef98e13b7d50781020502665620ab15659
parents 172fa08e 4cbee7d2
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -48,10 +48,6 @@ include $(wildcard $(LOCAL_PATH)/*/jni/Android.mk)

LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -DGL_GLEXT_PROTOTYPES

ifeq ($(WITH_MALLOC_LEAK_CHECK),true)
    LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK
endif

LOCAL_MODULE:= libandroid_servers

include $(BUILD_SHARED_LIBRARY)