ART: Include cleanup
Let clang-format reorder the header includes.
Derived with:
* .clang-format:
BasedOnStyle: Google
IncludeIsMainRegex: '(_test|-inl)?$'
* Steps:
find . -name '*.cc' -o -name '*.h' | xargs sed -i.bak -e 's/^#include/ #include/' ; git commit -a -m 'ART: Include cleanup'
git-clang-format -style=file HEAD^
manual inspection
git commit -a --amend
Test: mmma art
Change-Id: Ia963a8ce3ce5f96b5e78acd587e26908c7a70d02
diff --git a/compiler/linker/arm/relative_patcher_thumb2.cc b/compiler/linker/arm/relative_patcher_thumb2.cc
index 18d6b9a..2ac2a1d 100644
--- a/compiler/linker/arm/relative_patcher_thumb2.cc
+++ b/compiler/linker/arm/relative_patcher_thumb2.cc
@@ -22,8 +22,8 @@
#include "compiled_method.h"
#include "entrypoints/quick/quick_entrypoints_enum.h"
#include "lock_word.h"
-#include "mirror/object.h"
#include "mirror/array-inl.h"
+#include "mirror/object.h"
#include "read_barrier.h"
#include "utils/arm/assembler_arm_vixl.h"
diff --git a/compiler/linker/arm/relative_patcher_thumb2_test.cc b/compiler/linker/arm/relative_patcher_thumb2_test.cc
index 52e27af..fe76dfe 100644
--- a/compiler/linker/arm/relative_patcher_thumb2_test.cc
+++ b/compiler/linker/arm/relative_patcher_thumb2_test.cc
@@ -14,9 +14,10 @@
* limitations under the License.
*/
+#include "linker/arm/relative_patcher_thumb2.h"
+
#include "base/casts.h"
#include "linker/relative_patcher_test.h"
-#include "linker/arm/relative_patcher_thumb2.h"
#include "lock_word.h"
#include "mirror/array-inl.h"
#include "mirror/object.h"
diff --git a/compiler/linker/arm64/relative_patcher_arm64.cc b/compiler/linker/arm64/relative_patcher_arm64.cc
index 38c732b..db829f3 100644
--- a/compiler/linker/arm64/relative_patcher_arm64.cc
+++ b/compiler/linker/arm64/relative_patcher_arm64.cc
@@ -25,8 +25,8 @@
#include "entrypoints/quick/quick_entrypoints_enum.h"
#include "linker/output_stream.h"
#include "lock_word.h"
-#include "mirror/object.h"
#include "mirror/array-inl.h"
+#include "mirror/object.h"
#include "oat.h"
#include "oat_quick_method_header.h"
#include "read_barrier.h"
diff --git a/compiler/linker/arm64/relative_patcher_arm64_test.cc b/compiler/linker/arm64/relative_patcher_arm64_test.cc
index 5d02d44..d6919e9 100644
--- a/compiler/linker/arm64/relative_patcher_arm64_test.cc
+++ b/compiler/linker/arm64/relative_patcher_arm64_test.cc
@@ -14,9 +14,10 @@
* limitations under the License.
*/
+#include "linker/arm64/relative_patcher_arm64.h"
+
#include "base/casts.h"
#include "linker/relative_patcher_test.h"
-#include "linker/arm64/relative_patcher_arm64.h"
#include "lock_word.h"
#include "mirror/array-inl.h"
#include "mirror/object.h"
diff --git a/compiler/linker/mips/relative_patcher_mips.h b/compiler/linker/mips/relative_patcher_mips.h
index 0b74bd3..d6eda34 100644
--- a/compiler/linker/mips/relative_patcher_mips.h
+++ b/compiler/linker/mips/relative_patcher_mips.h
@@ -17,8 +17,8 @@
#ifndef ART_COMPILER_LINKER_MIPS_RELATIVE_PATCHER_MIPS_H_
#define ART_COMPILER_LINKER_MIPS_RELATIVE_PATCHER_MIPS_H_
-#include "linker/relative_patcher.h"
#include "arch/mips/instruction_set_features_mips.h"
+#include "linker/relative_patcher.h"
namespace art {
namespace linker {
diff --git a/compiler/linker/mips/relative_patcher_mips32r6_test.cc b/compiler/linker/mips/relative_patcher_mips32r6_test.cc
index d1a75e2..586e2aa 100644
--- a/compiler/linker/mips/relative_patcher_mips32r6_test.cc
+++ b/compiler/linker/mips/relative_patcher_mips32r6_test.cc
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#include "linker/relative_patcher_test.h"
#include "linker/mips/relative_patcher_mips.h"
+#include "linker/relative_patcher_test.h"
namespace art {
namespace linker {
diff --git a/compiler/linker/mips/relative_patcher_mips_test.cc b/compiler/linker/mips/relative_patcher_mips_test.cc
index 2f7a075..ebe5406 100644
--- a/compiler/linker/mips/relative_patcher_mips_test.cc
+++ b/compiler/linker/mips/relative_patcher_mips_test.cc
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#include "linker/relative_patcher_test.h"
#include "linker/mips/relative_patcher_mips.h"
+#include "linker/relative_patcher_test.h"
+
namespace art {
namespace linker {
diff --git a/compiler/linker/mips64/relative_patcher_mips64_test.cc b/compiler/linker/mips64/relative_patcher_mips64_test.cc
index a5f494d..4edcae7 100644
--- a/compiler/linker/mips64/relative_patcher_mips64_test.cc
+++ b/compiler/linker/mips64/relative_patcher_mips64_test.cc
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#include "linker/relative_patcher_test.h"
#include "linker/mips64/relative_patcher_mips64.h"
+#include "linker/relative_patcher_test.h"
+
namespace art {
namespace linker {
diff --git a/compiler/linker/multi_oat_relative_patcher.cc b/compiler/linker/multi_oat_relative_patcher.cc
index e9e242b..4ae75d6 100644
--- a/compiler/linker/multi_oat_relative_patcher.cc
+++ b/compiler/linker/multi_oat_relative_patcher.cc
@@ -16,9 +16,9 @@
#include "multi_oat_relative_patcher.h"
-#include "globals.h"
#include "base/bit_utils.h"
#include "base/logging.h"
+#include "globals.h"
namespace art {
namespace linker {
diff --git a/compiler/linker/multi_oat_relative_patcher_test.cc b/compiler/linker/multi_oat_relative_patcher_test.cc
index 615b2b9..e967901 100644
--- a/compiler/linker/multi_oat_relative_patcher_test.cc
+++ b/compiler/linker/multi_oat_relative_patcher_test.cc
@@ -14,9 +14,10 @@
* limitations under the License.
*/
+#include "multi_oat_relative_patcher.h"
+
#include "compiled_method.h"
#include "gtest/gtest.h"
-#include "multi_oat_relative_patcher.h"
#include "vector_output_stream.h"
namespace art {
diff --git a/compiler/linker/output_stream_test.cc b/compiler/linker/output_stream_test.cc
index 09fef29..87cb100 100644
--- a/compiler/linker/output_stream_test.cc
+++ b/compiler/linker/output_stream_test.cc
@@ -17,8 +17,8 @@
#include "file_output_stream.h"
#include "vector_output_stream.h"
-#include "base/unix_file/fd_file.h"
#include "base/logging.h"
+#include "base/unix_file/fd_file.h"
#include "buffered_output_stream.h"
#include "common_runtime_test.h"
diff --git a/compiler/linker/vector_output_stream.h b/compiler/linker/vector_output_stream.h
index 3210143..a9b93e7 100644
--- a/compiler/linker/vector_output_stream.h
+++ b/compiler/linker/vector_output_stream.h
@@ -19,8 +19,8 @@
#include "output_stream.h"
-#include <string>
#include <string.h>
+#include <string>
#include <vector>
namespace art {
diff --git a/compiler/linker/x86/relative_patcher_x86_test.cc b/compiler/linker/x86/relative_patcher_x86_test.cc
index 0bd9de8..4f74cee 100644
--- a/compiler/linker/x86/relative_patcher_x86_test.cc
+++ b/compiler/linker/x86/relative_patcher_x86_test.cc
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#include "linker/relative_patcher_test.h"
#include "linker/x86/relative_patcher_x86.h"
+#include "linker/relative_patcher_test.h"
+
namespace art {
namespace linker {
diff --git a/compiler/linker/x86_64/relative_patcher_x86_64_test.cc b/compiler/linker/x86_64/relative_patcher_x86_64_test.cc
index 6d6bb40..ae17aa7 100644
--- a/compiler/linker/x86_64/relative_patcher_x86_64_test.cc
+++ b/compiler/linker/x86_64/relative_patcher_x86_64_test.cc
@@ -14,9 +14,10 @@
* limitations under the License.
*/
-#include "linker/relative_patcher_test.h"
#include "linker/x86_64/relative_patcher_x86_64.h"
+#include "linker/relative_patcher_test.h"
+
namespace art {
namespace linker {