summaryrefslogtreecommitdiff
path: root/runtime/gc/allocator/dlmalloc.h
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2017-11-10 22:09:43 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-10 22:09:43 +0000
commit6e73556aaf7a02d19645eb6e52e785b51a28246a (patch)
tree8ffe8686a7ba789cfe8dd321c9220b289f501bed /runtime/gc/allocator/dlmalloc.h
parent0352112b751686fb7e943673966940a70c2eece9 (diff)
parent2a3089fe2303537ab447223e76dbfa1e99acd256 (diff)
Merge "Remove unused declarations of dead code." am: de3e912ad4
am: 2a3089fe23 Change-Id: I07c050dd14a93742f1cfa478f4111b050fe8ab44
Diffstat (limited to 'runtime/gc/allocator/dlmalloc.h')
-rw-r--r--runtime/gc/allocator/dlmalloc.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/runtime/gc/allocator/dlmalloc.h b/runtime/gc/allocator/dlmalloc.h
index c07da5da4db..29b96ee96c4 100644
--- a/runtime/gc/allocator/dlmalloc.h
+++ b/runtime/gc/allocator/dlmalloc.h
@@ -35,13 +35,6 @@
#include "../../external/dlmalloc/malloc.h"
#pragma GCC diagnostic pop
-#ifdef ART_TARGET_ANDROID
-// Define dlmalloc routines from bionic that cannot be included directly because of redefining
-// symbols from the include above.
-extern "C" void dlmalloc_inspect_all(void(*handler)(void*, void *, size_t, void*), void* arg);
-extern "C" int dlmalloc_trim(size_t);
-#endif
-
// Callback for dlmalloc_inspect_all or mspace_inspect_all that will madvise(2) unused
// pages back to the kernel.
extern "C" void DlmallocMadviseCallback(void* start, void* end, size_t used_bytes, void* /*arg*/);