diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-16 20:31:53 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-10-16 21:30:37 -0700 |
| commit | d4c4d953035d4418126d36517e402f411d6a87f3 (patch) | |
| tree | 735aacf812bbac7c1ae7c0788c1ca6f58cfa82ee /runtime/elf_file_impl.h | |
| parent | 6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3 (diff) | |
| download | art-d4c4d953035d4418126d36517e402f411d6a87f3.zip art-d4c4d953035d4418126d36517e402f411d6a87f3.tar.gz art-d4c4d953035d4418126d36517e402f411d6a87f3.tar.bz2 | |
Some code clean-up.
Change-Id: I4b745fd5298cd61c793e3b57514b48347bd66c0e
Diffstat (limited to 'runtime/elf_file_impl.h')
| -rw-r--r-- | runtime/elf_file_impl.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/runtime/elf_file_impl.h b/runtime/elf_file_impl.h index a2fc422..a8bb465 100644 --- a/runtime/elf_file_impl.h +++ b/runtime/elf_file_impl.h @@ -21,11 +21,9 @@ #include <memory> #include <vector> -#include "base/unix_file/fd_file.h" -#include "globals.h" -#include "elf_utils.h" +// Explicitly include our own elf.h to avoid Linux and other dependencies. +#include "./elf.h" #include "mem_map.h" -#include "os.h" namespace art { @@ -207,13 +205,9 @@ class ElfFileImpl { Elf_Sword, Elf_Addr, Elf_Sym, Elf_Rel, Elf_Rela, Elf_Dyn, Elf_Off>> gdb_file_mapping_; void GdbJITSupport(); -}; -// Explicitly instantiated in elf_file.cc -typedef ElfFileImpl<Elf32_Ehdr, Elf32_Phdr, Elf32_Shdr, Elf32_Word, Elf32_Sword, - Elf32_Addr, Elf32_Sym, Elf32_Rel, Elf32_Rela, Elf32_Dyn, Elf32_Off> ElfFileImpl32; -typedef ElfFileImpl<Elf64_Ehdr, Elf64_Phdr, Elf64_Shdr, Elf64_Word, Elf64_Sword, - Elf64_Addr, Elf64_Sym, Elf64_Rel, Elf64_Rela, Elf64_Dyn, Elf64_Off> ElfFileImpl64; + DISALLOW_COPY_AND_ASSIGN(ElfFileImpl); +}; } // namespace art |