diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/1001-app-image-regions/app_image_regions.cc | 4 | ||||
-rw-r--r-- | test/137-cfi/cfi.cc | 2 | ||||
-rw-r--r-- | test/1945-proxy-method-arguments/get_args.cc | 2 | ||||
-rw-r--r-- | test/454-get-vreg/get_vreg_jni.cc | 2 | ||||
-rw-r--r-- | test/457-regs/regs_jni.cc | 2 | ||||
-rw-r--r-- | test/461-get-reference-vreg/get_reference_vreg_jni.cc | 2 | ||||
-rw-r--r-- | test/466-get-live-vreg/get_live_vreg_jni.cc | 2 | ||||
-rw-r--r-- | test/566-polymorphic-inlining/polymorphic_inline.cc | 4 | ||||
-rw-r--r-- | test/570-checker-osr/osr.cc | 4 | ||||
-rw-r--r-- | test/596-app-images/app_images.cc | 4 | ||||
-rw-r--r-- | test/661-oat-writer-layout/oat_writer_layout.cc | 2 | ||||
-rw-r--r-- | test/692-vdex-inmem-loader/vdex_inmem_loader.cc | 4 | ||||
-rw-r--r-- | test/common/runtime_state.cc | 6 | ||||
-rw-r--r-- | test/common/stack_inspect.cc | 4 | ||||
-rw-r--r-- | test/dexpreopt/dexpreopt_test.cc | 2 |
15 files changed, 23 insertions, 23 deletions
diff --git a/test/1001-app-image-regions/app_image_regions.cc b/test/1001-app-image-regions/app_image_regions.cc index dc16a84928..976f295695 100644 --- a/test/1001-app-image-regions/app_image_regions.cc +++ b/test/1001-app-image-regions/app_image_regions.cc @@ -18,10 +18,10 @@ #include "gc/heap.h" #include "gc/space/image_space.h" -#include "gc/space/space-inl.h" #include "gc/space/region_space.h" -#include "image.h" +#include "gc/space/space-inl.h" #include "mirror/class.h" +#include "oat/image.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" diff --git a/test/137-cfi/cfi.cc b/test/137-cfi/cfi.cc index 29a6ff581a..6c9c3febe0 100644 --- a/test/137-cfi/cfi.cc +++ b/test/137-cfi/cfi.cc @@ -38,7 +38,7 @@ #include "gc/heap.h" #include "gc/space/image_space.h" #include "jit/debugger_interface.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "runtime.h" namespace art { diff --git a/test/1945-proxy-method-arguments/get_args.cc b/test/1945-proxy-method-arguments/get_args.cc index 5191761ca5..c1b6e64b59 100644 --- a/test/1945-proxy-method-arguments/get_args.cc +++ b/test/1945-proxy-method-arguments/get_args.cc @@ -17,7 +17,7 @@ #include "arch/context.h" #include "art_method-inl.h" #include "jni.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" #include "thread.h" diff --git a/test/454-get-vreg/get_vreg_jni.cc b/test/454-get-vreg/get_vreg_jni.cc index eb81f3b6c8..bc053be88b 100644 --- a/test/454-get-vreg/get_vreg_jni.cc +++ b/test/454-get-vreg/get_vreg_jni.cc @@ -17,7 +17,7 @@ #include "arch/context.h" #include "art_method-inl.h" #include "jni.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" #include "thread.h" diff --git a/test/457-regs/regs_jni.cc b/test/457-regs/regs_jni.cc index 76351ecf62..c9b5e2f780 100644 --- a/test/457-regs/regs_jni.cc +++ b/test/457-regs/regs_jni.cc @@ -17,7 +17,7 @@ #include "arch/context.h" #include "art_method-inl.h" #include "jni.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" #include "thread.h" diff --git a/test/461-get-reference-vreg/get_reference_vreg_jni.cc b/test/461-get-reference-vreg/get_reference_vreg_jni.cc index 063668216c..00e7e9b637 100644 --- a/test/461-get-reference-vreg/get_reference_vreg_jni.cc +++ b/test/461-get-reference-vreg/get_reference_vreg_jni.cc @@ -17,7 +17,7 @@ #include "arch/context.h" #include "art_method-inl.h" #include "jni.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" #include "thread.h" diff --git a/test/466-get-live-vreg/get_live_vreg_jni.cc b/test/466-get-live-vreg/get_live_vreg_jni.cc index b1fd6b550b..114741f284 100644 --- a/test/466-get-live-vreg/get_live_vreg_jni.cc +++ b/test/466-get-live-vreg/get_live_vreg_jni.cc @@ -18,7 +18,7 @@ #include "art_method-inl.h" #include "dex/code_item_accessors-inl.h" #include "jni.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" #include "thread.h" diff --git a/test/566-polymorphic-inlining/polymorphic_inline.cc b/test/566-polymorphic-inlining/polymorphic_inline.cc index 02ba04c843..d98ee5d746 100644 --- a/test/566-polymorphic-inlining/polymorphic_inline.cc +++ b/test/566-polymorphic-inlining/polymorphic_inline.cc @@ -21,9 +21,9 @@ #include "jit/profiling_info.h" #include "mirror/class.h" #include "nativehelper/ScopedUtfChars.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" namespace art { diff --git a/test/570-checker-osr/osr.cc b/test/570-checker-osr/osr.cc index 506887a8ea..de220ce6e3 100644 --- a/test/570-checker-osr/osr.cc +++ b/test/570-checker-osr/osr.cc @@ -19,10 +19,10 @@ #include "jit/jit_code_cache.h" #include "jit/profiling_info.h" #include "nativehelper/ScopedUtfChars.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.h" -#include "stack_map.h" #include "thread-current-inl.h" namespace art { diff --git a/test/596-app-images/app_images.cc b/test/596-app-images/app_images.cc index 1bc2c1ef35..f7ea79a59d 100644 --- a/test/596-app-images/app_images.cc +++ b/test/596-app-images/app_images.cc @@ -25,10 +25,10 @@ #include "gc/heap.h" #include "gc/space/image_space.h" #include "gc/space/space-inl.h" -#include "image.h" #include "mirror/class.h" #include "nativehelper/scoped_utf_chars.h" -#include "oat_file.h" +#include "oat/image.h" +#include "oat/oat_file.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" diff --git a/test/661-oat-writer-layout/oat_writer_layout.cc b/test/661-oat-writer-layout/oat_writer_layout.cc index 4dd47a8d55..6eb056d5db 100644 --- a/test/661-oat-writer-layout/oat_writer_layout.cc +++ b/test/661-oat-writer-layout/oat_writer_layout.cc @@ -22,8 +22,8 @@ #include "mirror/dex_cache.h" #include "mirror/executable.h" #include "mirror/object-inl.h" +#include "oat/oat_file.h" #include "obj_ptr.h" -#include "oat_file.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" #include "thread.h" diff --git a/test/692-vdex-inmem-loader/vdex_inmem_loader.cc b/test/692-vdex-inmem-loader/vdex_inmem_loader.cc index a478f2686c..8152435212 100644 --- a/test/692-vdex-inmem-loader/vdex_inmem_loader.cc +++ b/test/692-vdex-inmem-loader/vdex_inmem_loader.cc @@ -18,8 +18,8 @@ #include "class_loader_utils.h" #include "jni.h" #include "nativehelper/scoped_utf_chars.h" -#include "oat_file_assistant.h" -#include "oat_file_manager.h" +#include "oat/oat_file_assistant.h" +#include "oat/oat_file_manager.h" #include "scoped_thread_state_change-inl.h" #include "thread.h" diff --git a/test/common/runtime_state.cc b/test/common/runtime_state.cc index 8e0507327e..ff17f64632 100644 --- a/test/common/runtime_state.cc +++ b/test/common/runtime_state.cc @@ -36,9 +36,9 @@ #include "mirror/class.h" #include "mirror/executable.h" #include "nativehelper/ScopedUtfChars.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 "profile/profile_compilation_info.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" diff --git a/test/common/stack_inspect.cc b/test/common/stack_inspect.cc index 3e737fdebc..1dd5f5a79d 100644 --- a/test/common/stack_inspect.cc +++ b/test/common/stack_inspect.cc @@ -24,8 +24,8 @@ #include "jni/jni_internal.h" #include "mirror/class-inl.h" #include "nth_caller_visitor.h" -#include "oat_file.h" -#include "oat_quick_method_header.h" +#include "oat/oat_file.h" +#include "oat/oat_quick_method_header.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" diff --git a/test/dexpreopt/dexpreopt_test.cc b/test/dexpreopt/dexpreopt_test.cc index eac84f5517..c5d34007ab 100644 --- a/test/dexpreopt/dexpreopt_test.cc +++ b/test/dexpreopt/dexpreopt_test.cc @@ -41,7 +41,7 @@ #include "base/os.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "oat_file_assistant.h" +#include "oat/oat_file_assistant.h" #include "procinfo/process_map.h" namespace art { |