summaryrefslogtreecommitdiff
path: root/compiler/optimizing
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2016-07-14 09:24:45 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-07-14 09:24:45 +0000
commit7598736db0647eb963e77fafc22af6c0a5747d20 (patch)
tree19b18b2bf954b537e4dade3e7e11e28229ccefc9 /compiler/optimizing
parent09d77fac678d6c4d743218ffb6b77dea002b073e (diff)
parent9c05578dd2306231437bd290c0f70abc2bb3b6d8 (diff)
Merge "Revert "Dump more dex file data in oatdump""
Diffstat (limited to 'compiler/optimizing')
-rw-r--r--compiler/optimizing/code_generator_arm.h2
-rw-r--r--compiler/optimizing/code_generator_arm64.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/code_generator_arm.h b/compiler/optimizing/code_generator_arm.h
index cc38f3e6a6..477c4f18c1 100644
--- a/compiler/optimizing/code_generator_arm.h
+++ b/compiler/optimizing/code_generator_arm.h
@@ -21,9 +21,9 @@
#include "dex/compiler_enums.h"
#include "driver/compiler_options.h"
#include "nodes.h"
-#include "string_reference.h"
#include "parallel_move_resolver.h"
#include "utils/arm/assembler_thumb2.h"
+#include "utils/string_reference.h"
#include "utils/type_reference.h"
namespace art {
diff --git a/compiler/optimizing/code_generator_arm64.h b/compiler/optimizing/code_generator_arm64.h
index c2f055a1cf..d4bf695602 100644
--- a/compiler/optimizing/code_generator_arm64.h
+++ b/compiler/optimizing/code_generator_arm64.h
@@ -24,8 +24,8 @@
#include "driver/compiler_options.h"
#include "nodes.h"
#include "parallel_move_resolver.h"
-#include "string_reference.h"
#include "utils/arm64/assembler_arm64.h"
+#include "utils/string_reference.h"
#include "utils/type_reference.h"
#include "vixl/a64/disasm-a64.h"
#include "vixl/a64/macro-assembler-a64.h"