diff options
| author | Nick Kralevich <nnk@google.com> | 2014-09-20 11:15:50 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2014-09-20 11:15:50 -0700 |
| commit | 4986a3875ff3772841a5211b99cc4cc9649789ce (patch) | |
| tree | 96bd4211a37ff79ab2817d4f091def8eafb74001 /services/Android.mk | |
| parent | 172fa08e9571d6e2bda6b2ab01242aa8ac1c3015 (diff) | |
| parent | 4cbee7d24d0d53bdf084c06857ee3dc325519a42 (diff) | |
| download | frameworks_base-4986a3875ff3772841a5211b99cc4cc9649789ce.zip frameworks_base-4986a3875ff3772841a5211b99cc4cc9649789ce.tar.gz frameworks_base-4986a3875ff3772841a5211b99cc4cc9649789ce.tar.bz2 | |
resolved conflicts for merge of 4cbee7d2 to lmp-mr1-dev-plus-aosp
Change-Id: Ibed2d1ef98e13b7d50781020502665620ab15659
Diffstat (limited to 'services/Android.mk')
| -rw-r--r-- | services/Android.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/services/Android.mk b/services/Android.mk index 3c94f43..da85528 100644 --- a/services/Android.mk +++ b/services/Android.mk @@ -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) |