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/openjdkjvmti/fixed_up_dex_file.h b/runtime/openjdkjvmti/fixed_up_dex_file.h
index db12f48..a96ee12 100644
--- a/runtime/openjdkjvmti/fixed_up_dex_file.h
+++ b/runtime/openjdkjvmti/fixed_up_dex_file.h
@@ -37,6 +37,7 @@
#include "jni.h"
#include "jvmti.h"
+
#include "base/mutex.h"
#include "dex_file.h"
diff --git a/runtime/openjdkjvmti/ti_class_definition.cc b/runtime/openjdkjvmti/ti_class_definition.cc
index 8e8ab19..c73ef0d 100644
--- a/runtime/openjdkjvmti/ti_class_definition.cc
+++ b/runtime/openjdkjvmti/ti_class_definition.cc
@@ -35,10 +35,10 @@
#include "class_linker-inl.h"
#include "dex_file.h"
#include "fixed_up_dex_file.h"
-#include "handle_scope-inl.h"
#include "handle.h"
-#include "mirror/class_ext.h"
+#include "handle_scope-inl.h"
#include "mirror/class-inl.h"
+#include "mirror/class_ext.h"
#include "mirror/object-inl.h"
#include "reflection.h"
#include "thread.h"
diff --git a/runtime/openjdkjvmti/ti_class_loader.h b/runtime/openjdkjvmti/ti_class_loader.h
index 1ac4988..af66c5f 100644
--- a/runtime/openjdkjvmti/ti_class_loader.h
+++ b/runtime/openjdkjvmti/ti_class_loader.h
@@ -57,8 +57,8 @@
#include "obj_ptr.h"
#include "scoped_thread_state_change-inl.h"
#include "stack.h"
-#include "ti_class_definition.h"
#include "thread_list.h"
+#include "ti_class_definition.h"
#include "transform.h"
#include "utf.h"
#include "utils/dex_cache_arrays_layout-inl.h"
diff --git a/runtime/openjdkjvmti/ti_dump.cc b/runtime/openjdkjvmti/ti_dump.cc
index 7a1e53f..809a5e4 100644
--- a/runtime/openjdkjvmti/ti_dump.cc
+++ b/runtime/openjdkjvmti/ti_dump.cc
@@ -33,7 +33,6 @@
#include <limits>
-
#include "art_jvmti.h"
#include "base/mutex.h"
#include "events-inl.h"
diff --git a/runtime/openjdkjvmti/ti_field.cc b/runtime/openjdkjvmti/ti_field.cc
index 32c064e..c45b926 100644
--- a/runtime/openjdkjvmti/ti_field.cc
+++ b/runtime/openjdkjvmti/ti_field.cc
@@ -31,8 +31,8 @@
#include "ti_field.h"
-#include "art_jvmti.h"
#include "art_field-inl.h"
+#include "art_jvmti.h"
#include "base/enums.h"
#include "dex_file_annotations.h"
#include "jni_internal.h"
diff --git a/runtime/openjdkjvmti/ti_heap.cc b/runtime/openjdkjvmti/ti_heap.cc
index 91fdaca..3397210 100644
--- a/runtime/openjdkjvmti/ti_heap.cc
+++ b/runtime/openjdkjvmti/ti_heap.cc
@@ -21,8 +21,8 @@
#include "base/macros.h"
#include "base/mutex.h"
#include "class_linker.h"
-#include "gc/heap.h"
#include "gc/heap-visit-objects-inl.h"
+#include "gc/heap.h"
#include "gc_root-inl.h"
#include "java_frame_root_info.h"
#include "jni_env_ext.h"
@@ -31,8 +31,8 @@
#include "mirror/class.h"
#include "mirror/object-inl.h"
#include "mirror/object_array-inl.h"
-#include "object_tagging.h"
#include "obj_ptr-inl.h"
+#include "object_tagging.h"
#include "primitive.h"
#include "runtime.h"
#include "scoped_thread_state_change-inl.h"
diff --git a/runtime/openjdkjvmti/ti_redefine.h b/runtime/openjdkjvmti/ti_redefine.h
index 27d7c3d..03b4bf2 100644
--- a/runtime/openjdkjvmti/ti_redefine.h
+++ b/runtime/openjdkjvmti/ti_redefine.h
@@ -57,8 +57,8 @@
#include "obj_ptr.h"
#include "scoped_thread_state_change-inl.h"
#include "stack.h"
-#include "ti_class_definition.h"
#include "thread_list.h"
+#include "ti_class_definition.h"
#include "transform.h"
#include "utf.h"
#include "utils/dex_cache_arrays_layout-inl.h"
diff --git a/runtime/openjdkjvmti/transform.h b/runtime/openjdkjvmti/transform.h
index ba40e04..ed24068 100644
--- a/runtime/openjdkjvmti/transform.h
+++ b/runtime/openjdkjvmti/transform.h
@@ -35,10 +35,10 @@
#include <string>
#include <jni.h>
+#include "jvmti.h"
#include "art_jvmti.h"
#include "ti_class_definition.h"
-#include "jvmti.h"
namespace openjdkjvmti {