diff options
author | Christopher Ferris <cferris@google.com> | 2014-09-20 02:56:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-20 02:56:48 +0000 |
commit | 172fa08e9571d6e2bda6b2ab01242aa8ac1c3015 (patch) | |
tree | af5a63051a66018465ffbcb26b4a39d1c50b966d | |
parent | cb0721ff8f61a63bd53c13897cc0d1db32374ac4 (diff) | |
parent | 7d1138298b37bca2340fc4610090b53f5b838f7a (diff) | |
download | frameworks_base-172fa08e9571d6e2bda6b2ab01242aa8ac1c3015.zip frameworks_base-172fa08e9571d6e2bda6b2ab01242aa8ac1c3015.tar.gz frameworks_base-172fa08e9571d6e2bda6b2ab01242aa8ac1c3015.tar.bz2 |
am 7d113829: am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references."
* commit '7d1138298b37bca2340fc4610090b53f5b838f7a':
Remove MALLOC_LEAK_CHECK references.
-rw-r--r-- | core/jni/Android.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index 771e286..0cb0ea0 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -261,10 +261,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 |