summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-09-20 00:49:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-20 00:49:35 +0000
commit7d1138298b37bca2340fc4610090b53f5b838f7a (patch)
tree6ebd6e1b0ac2474dc6125f6df0ef0f562265ca42
parent4fec1b488759a89732af151e21a89aa6693ba9bf (diff)
parentb6f891c42ffdfdd9adc3811adaf09e09e3db7e84 (diff)
downloadframeworks_base-7d1138298b37bca2340fc4610090b53f5b838f7a.zip
frameworks_base-7d1138298b37bca2340fc4610090b53f5b838f7a.tar.gz
frameworks_base-7d1138298b37bca2340fc4610090b53f5b838f7a.tar.bz2
am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references."
* commit 'b6f891c42ffdfdd9adc3811adaf09e09e3db7e84': Remove MALLOC_LEAK_CHECK references.
-rw-r--r--core/jni/Android.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index d19bcae..5d10f3c 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -224,10 +224,6 @@ LOCAL_SHARED_LIBRARIES += \
# <bionic_tls.h> in com_google_android_gles_jni_GLImpl.cpp
LOCAL_C_INCLUDES += bionic/libc/private
-ifeq ($(WITH_MALLOC_LEAK_CHECK),true)
- LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK
-endif
-
LOCAL_MODULE:= libandroid_runtime
include external/stlport/libstlport.mk