diff options
author | Ryan Prichard <rprichard@google.com> | 2019-01-23 17:46:24 -0800 |
---|---|---|
committer | Ryan Prichard <rprichard@google.com> | 2019-01-25 14:48:00 -0800 |
commit | 52165b34b9c36eae4e15c47c25ab3c51b2029592 (patch) | |
tree | 60e48aa85eb4ed8fefa0275667a5bfe1c5db1f80 /linker/linker_allocator.cpp | |
parent | 70ee1825d0e8c72570c834db0f27ab806de5d857 (diff) |
Replace some of linker_allocator's header includes
The <async_safe/log.h> include in linker_allocator.h was made
unnecessary when the STL dependency was removed.
Replace the linker_*.h header includes with private/bionic_*.h
includes.
This change prepares LinkerMemoryAllocator for use in libc allocating
dynamic ELF TLS memory.
Bug: http://b/78026329
Test: bionic unit tests
Change-Id: I6ad62bd513e71dd3f91a4b724a92b19a1eb6c3b4
Diffstat (limited to 'linker/linker_allocator.cpp')
-rw-r--r-- | linker/linker_allocator.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linker/linker_allocator.cpp b/linker/linker_allocator.cpp index 015768ac9..df7c999ad 100644 --- a/linker/linker_allocator.cpp +++ b/linker/linker_allocator.cpp @@ -27,16 +27,19 @@ */ #include "linker_allocator.h" -#include "linker_debug.h" -#include "linker.h" #include <stdlib.h> +#include <string.h> #include <sys/mman.h> #include <sys/prctl.h> #include <unistd.h> +#include <new> + #include <async_safe/log.h> +#include "private/bionic_page.h" + // // LinkerMemeoryAllocator is general purpose allocator // designed to provide the same functionality as the malloc/free/realloc |