diff options
Diffstat (limited to 'runtime/entrypoints')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils-inl.h | 4 | ||||
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.cc | 7 | ||||
| -rw-r--r-- | runtime/entrypoints/jni/jni_entrypoints.cc | 4 | ||||
| -rw-r--r-- | runtime/entrypoints/quick/quick_dexcache_entrypoints.cc | 4 | ||||
| -rw-r--r-- | runtime/entrypoints/quick/quick_trampoline_entrypoints.cc | 6 |
5 files changed, 12 insertions, 13 deletions
diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h index a854e0c5ac..c87aa763ec 100644 --- a/runtime/entrypoints/entrypoint_utils-inl.h +++ b/runtime/entrypoints/entrypoint_utils-inl.h @@ -40,10 +40,10 @@ #include "mirror/object-inl.h" #include "mirror/throwable.h" #include "nth_caller_visitor.h" -#include "oat_file.h" +#include "oat/oat_file.h" +#include "oat/stack_map.h" #include "reflective_handle_scope-inl.h" #include "runtime.h" -#include "stack_map.h" #include "thread.h" #include "well_known_classes.h" diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index 96a2231930..fb29a66232 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -29,16 +29,15 @@ #include "entrypoints/quick/callee_save_frame.h" #include "entrypoints/runtime_asm_entrypoints.h" #include "gc/accounting/card_table-inl.h" -#include "index_bss_mapping.h" #include "jni/java_vm_ext.h" #include "mirror/class-inl.h" #include "mirror/method.h" #include "mirror/object-inl.h" #include "mirror/object_array-alloc-inl.h" #include "nth_caller_visitor.h" -#include "oat_file.h" -#include "oat_file-inl.h" -#include "oat_quick_method_header.h" +#include "oat/index_bss_mapping.h" +#include "oat/oat_file-inl.h" +#include "oat/oat_quick_method_header.h" #include "reflection.h" #include "scoped_thread_state_change-inl.h" #include "well_known_classes-inl.h" diff --git a/runtime/entrypoints/jni/jni_entrypoints.cc b/runtime/entrypoints/jni/jni_entrypoints.cc index 885764f180..6e6763b1e1 100644 --- a/runtime/entrypoints/jni/jni_entrypoints.cc +++ b/runtime/entrypoints/jni/jni_entrypoints.cc @@ -28,9 +28,9 @@ #include "entrypoints/entrypoint_utils-inl.h" #include "jni/java_vm_ext.h" #include "mirror/object-inl.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" +#include "oat/stack_map.h" #include "scoped_thread_state_change-inl.h" -#include "stack_map.h" #include "thread.h" namespace art HIDDEN { diff --git a/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc b/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc index f29143f79a..32c709c723 100644 --- a/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_dexcache_entrypoints.cc @@ -28,8 +28,8 @@ #include "mirror/class_loader.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" -#include "oat_file.h" -#include "oat_file-inl.h" +#include "oat/oat_file.h" +#include "oat/oat_file-inl.h" #include "runtime.h" namespace art HIDDEN { diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc index 33bc3b2f9f..cf09256f42 100644 --- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc @@ -47,9 +47,9 @@ #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "mirror/var_handle.h" -#include "oat.h" -#include "oat_file.h" -#include "oat_quick_method_header.h" +#include "oat/oat.h" +#include "oat/oat_file.h" +#include "oat/oat_quick_method_header.h" #include "quick_exception_handler.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" |