Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Android always has <malloc.h>."

Browse Source
This commit is contained in:
Elliott Hughes
2015-07-08 18:12:21 +00:00
committed by Gerrit Code Review
parent b05c2bebf8 c64df290e4
commit 07e1c409ac
1 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/jni/android_os_Debug.cpp
View File

@@ -34,10 +34,7 @@
#include <errno.h> #include <errno.h>
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#ifdef HAVE_MALLOC_H
#include <malloc.h> #include <malloc.h>
#endif
namespace android namespace android
{ {
@@ -128,32 +125,20 @@ struct stats_t {
static jlong android_os_Debug_getNativeHeapSize(JNIEnv *env, jobject clazz) static jlong android_os_Debug_getNativeHeapSize(JNIEnv *env, jobject clazz)
{ {
#ifdef HAVE_MALLOC_H
struct mallinfo info = mallinfo(); struct mallinfo info = mallinfo();
return (jlong) info.usmblks; return (jlong) info.usmblks;
#else
return -1;
#endif
} }
static jlong android_os_Debug_getNativeHeapAllocatedSize(JNIEnv *env, jobject clazz) static jlong android_os_Debug_getNativeHeapAllocatedSize(JNIEnv *env, jobject clazz)
{ {
#ifdef HAVE_MALLOC_H
struct mallinfo info = mallinfo(); struct mallinfo info = mallinfo();
return (jlong) info.uordblks; return (jlong) info.uordblks;
#else
return -1;
#endif
} }
static jlong android_os_Debug_getNativeHeapFreeSize(JNIEnv *env, jobject clazz) static jlong android_os_Debug_getNativeHeapFreeSize(JNIEnv *env, jobject clazz)
{ {
#ifdef HAVE_MALLOC_H
struct mallinfo info = mallinfo(); struct mallinfo info = mallinfo();
return (jlong) info.fordblks; return (jlong) info.fordblks;
#else
return -1;
#endif
} }
// Container used to retrieve graphics memory pss // Container used to retrieve graphics memory pss