diff options
| author | 2018-03-02 12:01:51 -0800 | |
|---|---|---|
| committer | 2018-03-08 23:23:32 +0000 | |
| commit | 8f4b056427a9d2321e3aa4f21ca8ffb18b3e5ae6 (patch) | |
| tree | e4d4bd04a04a1e3fc5b210b0c02542d453b84781 /runtime/gc/allocator/dlmalloc.cc | |
| parent | cedad4bd452f800ada0be930e801cd921319cd11 (diff) | |
Move most of runtime/base to libartbase/base
Enforce the layering that code in runtime/base should not depend on
runtime by separating it into libartbase. Some of the code in
runtime/base depends on the Runtime class, so it cannot be moved yet.
Also, some of the tests depend on CommonRuntimeTest, which itself needs
to be factored (in a subsequent CL).
Bug: 22322814
Test: make -j 50 checkbuild
make -j 50 test-art-host
Change-Id: I8b096c1e2542f829eb456b4b057c71421b77d7e2
Merged-In: c431b9dc4b23cc950eb313695258df5d89f53b22
(cherry picked from commit c431b9dc4b23cc950eb313695258df5d89f53b22)
Diffstat (limited to 'runtime/gc/allocator/dlmalloc.cc')
| -rw-r--r-- | runtime/gc/allocator/dlmalloc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/gc/allocator/dlmalloc.cc b/runtime/gc/allocator/dlmalloc.cc index 4570e9c1b8..e508d5fddf 100644 --- a/runtime/gc/allocator/dlmalloc.cc +++ b/runtime/gc/allocator/dlmalloc.cc @@ -59,8 +59,8 @@ static void art_heap_usage_error(const char* function, void* p) { #include <sys/mman.h> -#include "globals.h" -#include "utils.h" +#include "base/globals.h" +#include "base/utils.h" extern "C" void DlmallocMadviseCallback(void* start, void* end, size_t used_bytes, void* arg) { // Is this chunk in use? |