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

Change-Id: Ibed2d1ef98e13b7d50781020502665620ab15659
This commit is contained in:
Nick Kralevich
2014-09-20 11:15:50 -07:00

View File

@@ -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)