am 80664231: Merge "Revert "Temporarily expose dlmalloc_usable_size.""

* commit '80664231b8a17fc6a1bf2f4881c9353a47b74ab6':
  Revert "Temporarily expose dlmalloc_usable_size."
This commit is contained in:
Elliott Hughes 2014-06-11 03:24:32 +00:00 committed by Android Git Automerger
commit b94b1bc034

View file

@ -32,15 +32,10 @@
#define USE_SPIN_LOCKS 0
#define DEFAULT_MMAP_THRESHOLD (64U * 1024U)
__BEGIN_DECLS
/* Export two symbols used by the VM. */
__BEGIN_DECLS
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. */