summaryrefslogtreecommitdiff
path: root/compiler/linker
diff options
context:
space:
mode:
author David Sehr <sehr@google.com> 2018-02-26 16:43:04 -0800
committer David Sehr <sehr@google.com> 2018-02-28 15:08:21 -0800
commit67bf42e89592c3a1c648f927f2ce3ccb189a1161 (patch)
tree054d5b7adf7cc62d4d2a2118a70c0fbdd1751610 /compiler/linker
parentd961043ff1dd6fddb68aa90c1f939cfafec24219 (diff)
Header library to remove dependence on runtime/
Add a new header library to remove libdexfile and others' dependence on runtime (typically runtime/base) includes in libdexfile. Also a small step to tease dexlayout and profman away from relying on these as well. Bug: 22322814 Test: make -j 50 checkbuild make -j 50 test-art-host-gtest Change-Id: I38e2fe399a75f4bc6318c77a71954c00ea73ec2b
Diffstat (limited to 'compiler/linker')
-rw-r--r--compiler/linker/arm/relative_patcher_arm_base.h2
-rw-r--r--compiler/linker/elf_builder.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/linker/arm/relative_patcher_arm_base.h b/compiler/linker/arm/relative_patcher_arm_base.h
index 4c2be1e1a7..b0064d1554 100644
--- a/compiler/linker/arm/relative_patcher_arm_base.h
+++ b/compiler/linker/arm/relative_patcher_arm_base.h
@@ -20,9 +20,9 @@
#include <deque>
#include <vector>
+#include "base/safe_map.h"
#include "linker/relative_patcher.h"
#include "method_reference.h"
-#include "safe_map.h"
namespace art {
namespace linker {
diff --git a/compiler/linker/elf_builder.h b/compiler/linker/elf_builder.h
index 9fb4b18c27..a5f60992ca 100644
--- a/compiler/linker/elf_builder.h
+++ b/compiler/linker/elf_builder.h
@@ -24,9 +24,9 @@
#include "base/array_ref.h"
#include "base/bit_utils.h"
#include "base/casts.h"
+#include "base/leb128.h"
#include "base/unix_file/fd_file.h"
#include "elf_utils.h"
-#include "leb128.h"
#include "linker/error_delaying_output_stream.h"
namespace art {