am a4edb723: am 37229f2a: Merge "Temporarily expose dlmalloc_usable_size."

* commit 'a4edb7235084cdf62149310fcb1653596f680948':
  Temporarily expose dlmalloc_usable_size.
This commit is contained in:
Elliott Hughes 2014-06-04 23:33:02 +00:00 committed by Android Git Automerger
commit 31fee71b43

View File

@ -32,10 +32,15 @@
#define USE_SPIN_LOCKS 0
#define DEFAULT_MMAP_THRESHOLD (64U * 1024U)
/* Export two symbols used by the VM. */
__BEGIN_DECLS
/* Export two symbols used by the VM. */
int dlmalloc_trim(size_t) __LIBC_ABI_PUBLIC__;
void dlmalloc_inspect_all(void (*handler)(void*, void*, size_t, void*), void*) __LIBC_ABI_PUBLIC__;
/* NVIDIA's libglcore.so has a reference to dlmalloc_usable_size. TODO: remove this. */
size_t dlmalloc_usable_size(const void*) __LIBC_ABI_PUBLIC__;
__END_DECLS
/* Include the proper definitions. */