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/runtime/base/arena_allocator.cc b/runtime/base/arena_allocator.cc
index 54b40f2..148ef86 100644
--- a/runtime/base/arena_allocator.cc
+++ b/runtime/base/arena_allocator.cc
@@ -26,8 +26,8 @@
#include "logging.h"
#include "mem_map.h"
#include "mutex.h"
-#include "thread-current-inl.h"
#include "systrace.h"
+#include "thread-current-inl.h"
namespace art {
diff --git a/runtime/base/arena_allocator.h b/runtime/base/arena_allocator.h
index a484c5c..0b1a3ba 100644
--- a/runtime/base/arena_allocator.h
+++ b/runtime/base/arena_allocator.h
@@ -17,8 +17,8 @@
#ifndef ART_RUNTIME_BASE_ARENA_ALLOCATOR_H_
#define ART_RUNTIME_BASE_ARENA_ALLOCATOR_H_
-#include <stdint.h>
#include <stddef.h>
+#include <stdint.h>
#include "base/bit_utils.h"
#include "base/dchecked_vector.h"
diff --git a/runtime/base/array_slice.h b/runtime/base/array_slice.h
index 0da977d..a7bce7d 100644
--- a/runtime/base/array_slice.h
+++ b/runtime/base/array_slice.h
@@ -17,10 +17,10 @@
#ifndef ART_RUNTIME_BASE_ARRAY_SLICE_H_
#define ART_RUNTIME_BASE_ARRAY_SLICE_H_
-#include "stride_iterator.h"
#include "base/bit_utils.h"
#include "base/casts.h"
#include "base/iteration_range.h"
+#include "stride_iterator.h"
namespace art {
diff --git a/runtime/base/casts.h b/runtime/base/casts.h
index c5b0af6..0cbabba 100644
--- a/runtime/base/casts.h
+++ b/runtime/base/casts.h
@@ -18,9 +18,10 @@
#define ART_RUNTIME_BASE_CASTS_H_
#include <assert.h>
-#include <limits>
#include <stdint.h>
#include <string.h>
+
+#include <limits>
#include <type_traits>
#include "base/logging.h"
diff --git a/runtime/base/hash_set.h b/runtime/base/hash_set.h
index a22efcf..c472a9e 100644
--- a/runtime/base/hash_set.h
+++ b/runtime/base/hash_set.h
@@ -17,10 +17,11 @@
#ifndef ART_RUNTIME_BASE_HASH_SET_H_
#define ART_RUNTIME_BASE_HASH_SET_H_
+#include <stdint.h>
+
#include <functional>
#include <iterator>
#include <memory>
-#include <stdint.h>
#include <utility>
#include "bit_utils.h"
diff --git a/runtime/base/hash_set_test.cc b/runtime/base/hash_set_test.cc
index 8254063..31b28eb 100644
--- a/runtime/base/hash_set_test.cc
+++ b/runtime/base/hash_set_test.cc
@@ -16,8 +16,8 @@
#include "hash_set.h"
-#include <map>
#include <forward_list>
+#include <map>
#include <sstream>
#include <string>
#include <unordered_set>
diff --git a/runtime/base/histogram.h b/runtime/base/histogram.h
index 0e3bc8e..e0c921e 100644
--- a/runtime/base/histogram.h
+++ b/runtime/base/histogram.h
@@ -16,8 +16,8 @@
#ifndef ART_RUNTIME_BASE_HISTOGRAM_H_
#define ART_RUNTIME_BASE_HISTOGRAM_H_
-#include <vector>
#include <string>
+#include <vector>
#include "base/logging.h"
diff --git a/runtime/base/length_prefixed_array.h b/runtime/base/length_prefixed_array.h
index a570b81..2df5a99 100644
--- a/runtime/base/length_prefixed_array.h
+++ b/runtime/base/length_prefixed_array.h
@@ -20,10 +20,10 @@
#include <stddef.h> // for offsetof()
#include <string.h> // for memset()
-#include "stride_iterator.h"
#include "base/bit_utils.h"
#include "base/casts.h"
#include "base/iteration_range.h"
+#include "stride_iterator.h"
namespace art {
diff --git a/runtime/base/memory_tool.h b/runtime/base/memory_tool.h
index 42cbaa0..223c1de 100644
--- a/runtime/base/memory_tool.h
+++ b/runtime/base/memory_tool.h
@@ -52,8 +52,8 @@
#else
-#include <valgrind.h>
#include <memcheck/memcheck.h>
+#include <valgrind.h>
#define MEMORY_TOOL_MAKE_NOACCESS(p, s) VALGRIND_MAKE_MEM_NOACCESS(p, s)
#define MEMORY_TOOL_MAKE_UNDEFINED(p, s) VALGRIND_MAKE_MEM_UNDEFINED(p, s)
#define MEMORY_TOOL_MAKE_DEFINED(p, s) VALGRIND_MAKE_MEM_DEFINED(p, s)
diff --git a/runtime/base/mutex.cc b/runtime/base/mutex.cc
index 03dda12..6392198 100644
--- a/runtime/base/mutex.cc
+++ b/runtime/base/mutex.cc
@@ -23,8 +23,8 @@
#include "atomic.h"
#include "base/logging.h"
-#include "base/time_utils.h"
#include "base/systrace.h"
+#include "base/time_utils.h"
#include "base/value_object.h"
#include "mutex-inl.h"
#include "scoped_thread_state_change-inl.h"
diff --git a/runtime/base/safe_copy.cc b/runtime/base/safe_copy.cc
index 06249ac..c76ea11 100644
--- a/runtime/base/safe_copy.cc
+++ b/runtime/base/safe_copy.cc
@@ -16,9 +16,9 @@
#include "safe_copy.h"
-#include <unistd.h>
#include <sys/uio.h>
#include <sys/user.h>
+#include <unistd.h>
#include <algorithm>
diff --git a/runtime/base/scoped_arena_containers.h b/runtime/base/scoped_arena_containers.h
index 7964705..4a6c907 100644
--- a/runtime/base/scoped_arena_containers.h
+++ b/runtime/base/scoped_arena_containers.h
@@ -26,8 +26,8 @@
#include "arena_containers.h" // For ArenaAllocatorAdapterKind.
#include "base/dchecked_vector.h"
-#include "scoped_arena_allocator.h"
#include "safe_map.h"
+#include "scoped_arena_allocator.h"
namespace art {
diff --git a/runtime/base/systrace.h b/runtime/base/systrace.h
index 3901f96..06db48a 100644
--- a/runtime/base/systrace.h
+++ b/runtime/base/systrace.h
@@ -19,9 +19,10 @@
#define ATRACE_TAG ATRACE_TAG_DALVIK
#include <cutils/trace.h>
-#include <string>
#include <utils/Trace.h>
+#include <string>
+
namespace art {
class ScopedTrace {
diff --git a/runtime/base/time_utils.h b/runtime/base/time_utils.h
index dbb8bcd..919937f 100644
--- a/runtime/base/time_utils.h
+++ b/runtime/base/time_utils.h
@@ -18,9 +18,10 @@
#define ART_RUNTIME_BASE_TIME_UTILS_H_
#include <stdint.h>
-#include <string>
#include <time.h>
+#include <string>
+
#include "base/macros.h"
namespace art {
diff --git a/runtime/base/timing_logger.cc b/runtime/base/timing_logger.cc
index aaa2431..b2e5251 100644
--- a/runtime/base/timing_logger.cc
+++ b/runtime/base/timing_logger.cc
@@ -14,14 +14,13 @@
* limitations under the License.
*/
-
#include <stdio.h>
#include "timing_logger.h"
+#include "base/histogram-inl.h"
#include "base/logging.h"
#include "base/stl_util.h"
-#include "base/histogram-inl.h"
#include "base/systrace.h"
#include "base/time_utils.h"
#include "gc/heap.h"
diff --git a/runtime/base/unix_file/fd_file.cc b/runtime/base/unix_file/fd_file.cc
index 00b5567..0c73ce7 100644
--- a/runtime/base/unix_file/fd_file.cc
+++ b/runtime/base/unix_file/fd_file.cc
@@ -17,11 +17,12 @@
#include "base/unix_file/fd_file.h"
#include <errno.h>
-#include <limits>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
+#include <limits>
+
#include "base/logging.h"
// Includes needed for FdFile::Copy().
diff --git a/runtime/base/unix_file/fd_file.h b/runtime/base/unix_file/fd_file.h
index eb85c4f..e07c3fd 100644
--- a/runtime/base/unix_file/fd_file.h
+++ b/runtime/base/unix_file/fd_file.h
@@ -21,8 +21,8 @@
#include <string>
-#include "base/unix_file/random_access_file.h"
#include "base/macros.h"
+#include "base/unix_file/random_access_file.h"
namespace unix_file {
diff --git a/runtime/base/unix_file/random_access_file_utils.cc b/runtime/base/unix_file/random_access_file_utils.cc
index df3b308..aae65c1 100644
--- a/runtime/base/unix_file/random_access_file_utils.cc
+++ b/runtime/base/unix_file/random_access_file_utils.cc
@@ -14,8 +14,10 @@
* limitations under the License.
*/
-#include <vector>
#include "base/unix_file/random_access_file_utils.h"
+
+#include <vector>
+
#include "base/unix_file/random_access_file.h"
namespace unix_file {