diff options
147 files changed, 272 insertions, 272 deletions
diff --git a/artd/artd.cc b/artd/artd.cc index 078afd99ac..f1fc558306 100644 --- a/artd/artd.cc +++ b/artd/artd.cc @@ -72,8 +72,8 @@ #include "exec_utils.h" #include "file_utils.h" #include "fstab/fstab.h" -#include "oat_file_assistant.h" -#include "oat_file_assistant_context.h" +#include "oat/oat_file_assistant.h" +#include "oat/oat_file_assistant_context.h" #include "path_utils.h" #include "profman/profman_result.h" #include "selinux/android.h" diff --git a/artd/artd.h b/artd/artd.h index d3a47f96cc..fd1ce19e55 100644 --- a/artd/artd.h +++ b/artd/artd.h @@ -39,7 +39,7 @@ #include "android/binder_auto_utils.h" #include "base/os.h" #include "exec_utils.h" -#include "oat_file_assistant_context.h" +#include "oat/oat_file_assistant_context.h" #include "tools/cmdline_builder.h" #include "tools/system_properties.h" diff --git a/artd/artd_test.cc b/artd/artd_test.cc index 6e6dad476d..fc7c0765ef 100644 --- a/artd/artd_test.cc +++ b/artd/artd_test.cc @@ -58,7 +58,7 @@ #include "exec_utils.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "path_utils.h" #include "profman/profman_result.h" #include "testing.h" diff --git a/artd/path_utils.cc b/artd/path_utils.cc index d3060cceb1..3d3a92f60c 100644 --- a/artd/path_utils.cc +++ b/artd/path_utils.cc @@ -29,7 +29,7 @@ #include "base/macros.h" #include "file_utils.h" #include "fstab/fstab.h" -#include "oat_file_assistant.h" +#include "oat/oat_file_assistant.h" #include "runtime_image.h" #include "service.h" #include "tools/tools.h" diff --git a/cmdline/cmdline.h b/cmdline/cmdline.h index 3aac785609..958f80d057 100644 --- a/cmdline/cmdline.h +++ b/cmdline/cmdline.h @@ -35,7 +35,7 @@ #include "base/string_view_cpp20.h" #include "base/utils.h" #include "noop_compiler_callbacks.h" -#include "oat_file_assistant_context.h" +#include "oat/oat_file_assistant_context.h" #include "runtime.h" #if !defined(NDEBUG) diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc index f94d3048c2..d2cf3aef3c 100644 --- a/compiler/common_compiler_test.cc +++ b/compiler/common_compiler_test.cc @@ -37,7 +37,7 @@ #include "mirror/class_loader.h" #include "mirror/dex_cache.h" #include "mirror/object-inl.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "scoped_thread_state_change-inl.h" #include "thread-current-inl.h" #include "utils/atomic_dex_ref_map-inl.h" diff --git a/compiler/common_compiler_test.h b/compiler/common_compiler_test.h index f3cd13296c..9b49c93ea6 100644 --- a/compiler/common_compiler_test.h +++ b/compiler/common_compiler_test.h @@ -27,7 +27,7 @@ #include "base/macros.h" #include "common_runtime_test.h" #include "compiler.h" -#include "oat_file.h" +#include "oat/oat_file.h" namespace art HIDDEN { namespace mirror { diff --git a/compiler/compiler.cc b/compiler/compiler.cc index e2587c1253..0e040ac54a 100644 --- a/compiler/compiler.cc +++ b/compiler/compiler.cc @@ -22,7 +22,7 @@ #include "base/utils.h" #include "dex/code_item_accessors-inl.h" #include "dex/dex_file.h" -#include "oat.h" +#include "oat/oat.h" #include "optimizing/optimizing_compiler.h" namespace art HIDDEN { diff --git a/compiler/debug/elf_debug_info_writer.h b/compiler/debug/elf_debug_info_writer.h index 9915a24a5f..50d3f2b6c8 100644 --- a/compiler/debug/elf_debug_info_writer.h +++ b/compiler/debug/elf_debug_info_writer.h @@ -37,7 +37,7 @@ #include "mirror/array.h" #include "mirror/class-inl.h" #include "mirror/class.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "obj_ptr-inl.h" namespace art HIDDEN { diff --git a/compiler/debug/elf_debug_line_writer.h b/compiler/debug/elf_debug_line_writer.h index 5d654e3e06..2664bbb6be 100644 --- a/compiler/debug/elf_debug_line_writer.h +++ b/compiler/debug/elf_debug_line_writer.h @@ -27,8 +27,8 @@ #include "dwarf/debug_line_opcode_writer.h" #include "dwarf/headers.h" #include "elf/elf_builder.h" -#include "oat_file.h" -#include "stack_map.h" +#include "oat/oat_file.h" +#include "oat/stack_map.h" namespace art HIDDEN { namespace debug { diff --git a/compiler/debug/elf_debug_loc_writer.h b/compiler/debug/elf_debug_loc_writer.h index 8cf476ed2d..9ff97b5a4f 100644 --- a/compiler/debug/elf_debug_loc_writer.h +++ b/compiler/debug/elf_debug_loc_writer.h @@ -25,7 +25,7 @@ #include "debug/method_debug_info.h" #include "dwarf/debug_info_entry_writer.h" #include "dwarf/register.h" -#include "stack_map.h" +#include "oat/stack_map.h" namespace art HIDDEN { namespace debug { diff --git a/compiler/debug/elf_debug_writer.cc b/compiler/debug/elf_debug_writer.cc index 505b6c5d8a..4d349da576 100644 --- a/compiler/debug/elf_debug_writer.cc +++ b/compiler/debug/elf_debug_writer.cc @@ -35,7 +35,7 @@ #include "elf/elf_utils.h" #include "elf/xz_utils.h" #include "jit/debugger_interface.h" -#include "oat.h" +#include "oat/oat.h" #include "stream/vector_output_stream.h" namespace art HIDDEN { diff --git a/compiler/exception_test.cc b/compiler/exception_test.cc index 75ade55799..b90b08240f 100644 --- a/compiler/exception_test.cc +++ b/compiler/exception_test.cc @@ -38,7 +38,7 @@ #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "mirror/stack_trace_element-inl.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "obj_ptr-inl.h" #include "optimizing/stack_map_stream.h" #include "runtime-inl.h" diff --git a/compiler/jit/jit_logger.cc b/compiler/jit/jit_logger.cc index 0ca5c38fb1..f192ce7139 100644 --- a/compiler/jit/jit_logger.cc +++ b/compiler/jit/jit_logger.cc @@ -22,7 +22,7 @@ #include "base/unix_file/fd_file.h" #include "jit/jit.h" #include "jit/jit_code_cache.h" -#include "oat_file-inl.h" +#include "oat/oat_file-inl.h" namespace art HIDDEN { namespace jit { diff --git a/compiler/jni/jni_compiler_test.cc b/compiler/jni/jni_compiler_test.cc index 40989b2999..77ebff6da2 100644 --- a/compiler/jni/jni_compiler_test.cc +++ b/compiler/jni/jni_compiler_test.cc @@ -42,7 +42,7 @@ #include "mirror/stack_trace_element-inl.h" #include "nativehelper/ScopedLocalRef.h" #include "nativeloader/native_loader.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" #include "thread-inl.h" diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index b0e07e32ea..b00e7e1873 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -48,7 +48,6 @@ #include "dex/bytecode_utils.h" #include "dex/code_item_accessors-inl.h" #include "graph_visualizer.h" -#include "image.h" #include "gc/space/image_space.h" #include "intern_table.h" #include "intrinsics.h" @@ -60,7 +59,8 @@ #include "parallel_move_resolver.h" #include "scoped_thread_state_change-inl.h" #include "ssa_liveness_analysis.h" -#include "stack_map.h" +#include "oat/image.h" +#include "oat/stack_map.h" #include "stack_map_stream.h" #include "string_builder_append.h" #include "thread-current-inl.h" diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index de6fc85da4..88e5a20240 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -34,7 +34,7 @@ #include "graph_visualizer.h" #include "locations.h" #include "nodes.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "optimizing_compiler_stats.h" #include "read_barrier_option.h" #include "stack.h" diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc index fe0f3fe319..23d47c3857 100644 --- a/compiler/optimizing/instruction_builder.cc +++ b/compiler/optimizing/instruction_builder.cc @@ -34,7 +34,7 @@ #include "intrinsics_utils.h" #include "jit/jit.h" #include "mirror/dex_cache.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "optimizing_compiler_stats.h" #include "reflective_handle_scope-inl.h" #include "scoped_thread_state_change-inl.h" diff --git a/compiler/optimizing/intrinsic_objects.cc b/compiler/optimizing/intrinsic_objects.cc index cf49f50d91..6c799d4132 100644 --- a/compiler/optimizing/intrinsic_objects.cc +++ b/compiler/optimizing/intrinsic_objects.cc @@ -19,8 +19,8 @@ #include "art_field-inl.h" #include "base/casts.h" #include "base/logging.h" -#include "image.h" #include "intrinsics.h" +#include "oat/image.h" #include "obj_ptr-inl.h" #include "well_known_classes.h" diff --git a/compiler/optimizing/intrinsics.cc b/compiler/optimizing/intrinsics.cc index 8330a973ff..06ea1c6ffb 100644 --- a/compiler/optimizing/intrinsics.cc +++ b/compiler/optimizing/intrinsics.cc @@ -25,10 +25,10 @@ #include "dex/invoke_type.h" #include "driver/compiler_options.h" #include "gc/space/image_space.h" -#include "image-inl.h" #include "intrinsic_objects.h" #include "intrinsics_list.h" #include "nodes.h" +#include "oat/image-inl.h" #include "obj_ptr-inl.h" #include "scoped_thread_state_change-inl.h" #include "thread-current-inl.h" diff --git a/compiler/optimizing/load_store_elimination.cc b/compiler/optimizing/load_store_elimination.cc index e7b95c8d00..20ca687ad5 100644 --- a/compiler/optimizing/load_store_elimination.cc +++ b/compiler/optimizing/load_store_elimination.cc @@ -38,10 +38,10 @@ #include "mirror/class_loader.h" #include "mirror/dex_cache.h" #include "nodes.h" +#include "oat/stack_map.h" #include "optimizing_compiler_stats.h" #include "reference_type_propagation.h" #include "side_effects_analysis.h" -#include "stack_map.h" /** * The general algorithm of load-store elimination (LSE). diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 8909a59ddf..2f795e6e70 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -50,7 +50,7 @@ #include "jni/quick/jni_compiler.h" #include "linker/linker_patch.h" #include "nodes.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "optimizing/write_barrier_elimination.h" #include "prepare_for_register_allocation.h" #include "profiling_info_builder.h" diff --git a/compiler/optimizing/stack_map_stream.cc b/compiler/optimizing/stack_map_stream.cc index 2ecda7610e..83551a9750 100644 --- a/compiler/optimizing/stack_map_stream.cc +++ b/compiler/optimizing/stack_map_stream.cc @@ -26,12 +26,12 @@ #include "dex/dex_file.h" #include "dex/dex_file_types.h" #include "driver/compiler_options.h" +#include "oat/stack_map.h" #include "optimizing/code_generator.h" #include "optimizing/nodes.h" #include "optimizing/optimizing_compiler.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" -#include "stack_map.h" namespace art HIDDEN { diff --git a/compiler/optimizing/stack_map_stream.h b/compiler/optimizing/stack_map_stream.h index f027850ce6..8c7b1c01a7 100644 --- a/compiler/optimizing/stack_map_stream.h +++ b/compiler/optimizing/stack_map_stream.h @@ -27,7 +27,7 @@ #include "base/value_object.h" #include "dex_register_location.h" #include "nodes.h" -#include "stack_map.h" +#include "oat/stack_map.h" namespace art HIDDEN { diff --git a/compiler/optimizing/stack_map_test.cc b/compiler/optimizing/stack_map_test.cc index a2c30e7681..6eb4fd9cf5 100644 --- a/compiler/optimizing/stack_map_test.cc +++ b/compiler/optimizing/stack_map_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "stack_map.h" +#include "oat/stack_map.h" #include "art_method.h" #include "base/arena_bit_vector.h" diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index 774a108679..c76929c030 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -45,7 +45,6 @@ #include "android-base/stringprintf.h" #include "android-base/strings.h" #include "android-base/unique_fd.h" -#include "aot_class_linker.h" #include "arch/instruction_set_features.h" #include "art_method-inl.h" #include "base/callee_save_type.h" @@ -83,7 +82,6 @@ #include "driver/compiler_driver.h" #include "driver/compiler_options.h" #include "driver/compiler_options_map-inl.h" -#include "elf_file.h" #include "gc/space/image_space.h" #include "gc/space/space-inl.h" #include "gc/verification.h" @@ -98,9 +96,11 @@ #include "mirror/class_loader.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" -#include "oat.h" -#include "oat_file.h" -#include "oat_file_assistant.h" +#include "oat/aot_class_linker.h" +#include "oat/elf_file.h" +#include "oat/oat.h" +#include "oat/oat_file.h" +#include "oat/oat_file_assistant.h" #include "palette/palette.h" #include "profile/profile_compilation_info.h" #include "runtime.h" diff --git a/dex2oat/dex2oat_options.h b/dex2oat/dex2oat_options.h index 1da1ff9a0a..ef07512f51 100644 --- a/dex2oat/dex2oat_options.h +++ b/dex2oat/dex2oat_options.h @@ -27,8 +27,8 @@ #include "compiler.h" #include "dex/compact_dex_level.h" #include "driver/compiler_options_map.h" -#include "image.h" #include "linker/oat_writer.h" +#include "oat/image.h" namespace art { diff --git a/dex2oat/dex2oat_test.cc b/dex2oat/dex2oat_test.cc index a0ce504b18..9c6a381ac3 100644 --- a/dex2oat/dex2oat_test.cc +++ b/dex2oat/dex2oat_test.cc @@ -43,12 +43,12 @@ #include "dex/dex_file-inl.h" #include "dex/dex_file_loader.h" #include "dex2oat_environment_test.h" -#include "elf_file.h" -#include "elf_file_impl.h" #include "gc_root-inl.h" #include "intern_table-inl.h" -#include "oat.h" -#include "oat_file.h" +#include "oat/elf_file.h" +#include "oat/elf_file_impl.h" +#include "oat/oat.h" +#include "oat/oat_file.h" #include "profile/profile_compilation_info.h" #include "vdex_file.h" #include "ziparchive/zip_writer.h" diff --git a/dex2oat/driver/compiler_driver.cc b/dex2oat/driver/compiler_driver.cc index ee31c7e7ab..824319b299 100644 --- a/dex2oat/driver/compiler_driver.cc +++ b/dex2oat/driver/compiler_driver.cc @@ -28,7 +28,6 @@ #include "android-base/logging.h" #include "android-base/strings.h" -#include "aot_class_linker.h" #include "art_field-inl.h" #include "art_method-inl.h" #include "base/arena_allocator.h" @@ -71,6 +70,7 @@ #include "mirror/object-refvisitor-inl.h" #include "mirror/object_array-inl.h" #include "mirror/throwable.h" +#include "oat/aot_class_linker.h" #include "object_lock.h" #include "profile/profile_compilation_info.h" #include "runtime.h" diff --git a/dex2oat/linker/arm/relative_patcher_arm_base.cc b/dex2oat/linker/arm/relative_patcher_arm_base.cc index 1cb72f6747..9a604bee48 100644 --- a/dex2oat/linker/arm/relative_patcher_arm_base.cc +++ b/dex2oat/linker/arm/relative_patcher_arm_base.cc @@ -21,8 +21,8 @@ #include "dex/dex_file_types.h" #include "driver/compiled_method-inl.h" #include "linker/linker_patch.h" -#include "oat.h" -#include "oat_quick_method_header.h" +#include "oat/oat.h" +#include "oat/oat_quick_method_header.h" #include "stream/output_stream.h" namespace art { diff --git a/dex2oat/linker/arm/relative_patcher_thumb2_test.cc b/dex2oat/linker/arm/relative_patcher_thumb2_test.cc index 4885cfc6db..461a331276 100644 --- a/dex2oat/linker/arm/relative_patcher_thumb2_test.cc +++ b/dex2oat/linker/arm/relative_patcher_thumb2_test.cc @@ -23,7 +23,7 @@ #include "lock_word.h" #include "mirror/array-inl.h" #include "mirror/object.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "optimizing/code_generator_arm_vixl.h" #include "optimizing/optimizing_unit_test.h" diff --git a/dex2oat/linker/arm64/relative_patcher_arm64.cc b/dex2oat/linker/arm64/relative_patcher_arm64.cc index db7ae74c72..e7431e4e1b 100644 --- a/dex2oat/linker/arm64/relative_patcher_arm64.cc +++ b/dex2oat/linker/arm64/relative_patcher_arm64.cc @@ -29,8 +29,8 @@ #include "lock_word.h" #include "mirror/array-inl.h" #include "mirror/object.h" -#include "oat.h" -#include "oat_quick_method_header.h" +#include "oat/oat.h" +#include "oat/oat_quick_method_header.h" #include "read_barrier.h" #include "stream/output_stream.h" diff --git a/dex2oat/linker/arm64/relative_patcher_arm64_test.cc b/dex2oat/linker/arm64/relative_patcher_arm64_test.cc index b140a5e41b..31160b97c5 100644 --- a/dex2oat/linker/arm64/relative_patcher_arm64_test.cc +++ b/dex2oat/linker/arm64/relative_patcher_arm64_test.cc @@ -23,7 +23,7 @@ #include "lock_word.h" #include "mirror/array-inl.h" #include "mirror/object.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "optimizing/code_generator_arm64.h" #include "optimizing/optimizing_unit_test.h" diff --git a/dex2oat/linker/code_info_table_deduper.cc b/dex2oat/linker/code_info_table_deduper.cc index e50f2a1fc2..a1c2e7fd66 100644 --- a/dex2oat/linker/code_info_table_deduper.cc +++ b/dex2oat/linker/code_info_table_deduper.cc @@ -16,7 +16,7 @@ #include "code_info_table_deduper.h" -#include "stack_map.h" +#include "oat/stack_map.h" namespace art { namespace linker { diff --git a/dex2oat/linker/elf_writer.cc b/dex2oat/linker/elf_writer.cc index aa5097a674..c050695e32 100644 --- a/dex2oat/linker/elf_writer.cc +++ b/dex2oat/linker/elf_writer.cc @@ -17,7 +17,7 @@ #include "elf_writer.h" #include "base/unix_file/fd_file.h" -#include "elf_file.h" +#include "oat/elf_file.h" namespace art { namespace linker { diff --git a/dex2oat/linker/elf_writer_test.cc b/dex2oat/linker/elf_writer_test.cc index 7800c28f68..e1ef575502 100644 --- a/dex2oat/linker/elf_writer_test.cc +++ b/dex2oat/linker/elf_writer_test.cc @@ -22,10 +22,10 @@ #include "base/utils.h" #include "common_compiler_driver_test.h" #include "elf/elf_builder.h" -#include "elf_file.h" -#include "elf_file_impl.h" #include "elf_writer_quick.h" -#include "oat.h" +#include "oat/elf_file.h" +#include "oat/elf_file_impl.h" +#include "oat/oat.h" namespace art { namespace linker { diff --git a/dex2oat/linker/image_test.cc b/dex2oat/linker/image_test.cc index fed8c70734..f64462e614 100644 --- a/dex2oat/linker/image_test.cc +++ b/dex2oat/linker/image_test.cc @@ -19,7 +19,7 @@ #include "image_test.h" -#include "image.h" +#include "oat/image.h" #include "scoped_thread_state_change-inl.h" #include "thread.h" diff --git a/dex2oat/linker/image_test.h b/dex2oat/linker/image_test.h index 70135fd3b4..b82f54b079 100644 --- a/dex2oat/linker/image_test.h +++ b/dex2oat/linker/image_test.h @@ -17,7 +17,7 @@ #ifndef ART_DEX2OAT_LINKER_IMAGE_TEST_H_ #define ART_DEX2OAT_LINKER_IMAGE_TEST_H_ -#include "image.h" +#include "oat/image.h" #include <memory> #include <string> @@ -48,7 +48,7 @@ #include "linker/multi_oat_relative_patcher.h" #include "lock_word.h" #include "mirror/object-inl.h" -#include "oat.h" +#include "oat/oat.h" #include "oat_writer.h" #include "read_barrier_config.h" #include "scoped_thread_state_change-inl.h" diff --git a/dex2oat/linker/image_writer.cc b/dex2oat/linker/image_writer.cc index 6564fb8136..b663d32e2e 100644 --- a/dex2oat/linker/image_writer.cc +++ b/dex2oat/linker/image_writer.cc @@ -41,7 +41,6 @@ #include "dex/dex_file_types.h" #include "driver/compiler_options.h" #include "elf/elf_utils.h" -#include "elf_file.h" #include "entrypoints/entrypoint_utils-inl.h" #include "gc/accounting/card_table-inl.h" #include "gc/accounting/heap_bitmap.h" @@ -54,7 +53,6 @@ #include "gc/space/space-inl.h" #include "gc/verification.h" #include "handle_scope-inl.h" -#include "image-inl.h" #include "imt_conflict_table.h" #include "indirect_reference_table-inl.h" #include "intern_table-inl.h" @@ -78,9 +76,11 @@ #include "mirror/var_handle.h" #include "nterp_helpers-inl.h" #include "nterp_helpers.h" -#include "oat.h" -#include "oat_file.h" -#include "oat_file_manager.h" +#include "oat/elf_file.h" +#include "oat/image-inl.h" +#include "oat/oat.h" +#include "oat/oat_file.h" +#include "oat/oat_file_manager.h" #include "optimizing/intrinsic_objects.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" diff --git a/dex2oat/linker/image_writer.h b/dex2oat/linker/image_writer.h index 86c0972d37..9dd6c7850e 100644 --- a/dex2oat/linker/image_writer.h +++ b/dex2oat/linker/image_writer.h @@ -41,12 +41,12 @@ #include "base/utils.h" #include "class_table.h" #include "gc/accounting/space_bitmap.h" -#include "image.h" #include "intern_table.h" #include "lock_word.h" #include "mirror/dex_cache.h" -#include "oat.h" -#include "oat_file.h" +#include "oat/image.h" +#include "oat/oat.h" +#include "oat/oat_file.h" #include "obj_ptr.h" namespace art { diff --git a/dex2oat/linker/index_bss_mapping_encoder.h b/dex2oat/linker/index_bss_mapping_encoder.h index c6326ed1cf..acc9706f5c 100644 --- a/dex2oat/linker/index_bss_mapping_encoder.h +++ b/dex2oat/linker/index_bss_mapping_encoder.h @@ -21,7 +21,7 @@ #include "base/bit_utils.h" #include "base/bit_vector-inl.h" -#include "index_bss_mapping.h" +#include "oat/index_bss_mapping.h" namespace art { namespace linker { diff --git a/dex2oat/linker/oat_writer.cc b/dex2oat/linker/oat_writer.cc index 1564d50161..b7858d61e9 100644 --- a/dex2oat/linker/oat_writer.cc +++ b/dex2oat/linker/oat_writer.cc @@ -67,11 +67,11 @@ #include "mirror/class_loader.h" #include "mirror/dex_cache-inl.h" #include "mirror/object-inl.h" -#include "oat.h" -#include "oat_quick_method_header.h" +#include "oat/oat.h" +#include "oat/oat_quick_method_header.h" +#include "oat/stack_map.h" #include "profile/profile_compilation_info.h" #include "scoped_thread_state_change-inl.h" -#include "stack_map.h" #include "stream/buffered_output_stream.h" #include "stream/file_output_stream.h" #include "stream/output_stream.h" diff --git a/dex2oat/linker/oat_writer_test.cc b/dex2oat/linker/oat_writer_test.cc index 1a241302d3..d3a480fb56 100644 --- a/dex2oat/linker/oat_writer_test.cc +++ b/dex2oat/linker/oat_writer_test.cc @@ -41,8 +41,8 @@ #include "mirror/class-inl.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" -#include "oat.h" -#include "oat_file-inl.h" +#include "oat/oat.h" +#include "oat/oat_file-inl.h" #include "oat_writer.h" #include "profile/profile_compilation_info.h" #include "scoped_thread_state_change-inl.h" diff --git a/dex2oat/linker/relative_patcher_test.h b/dex2oat/linker/relative_patcher_test.h index 7a8497d1ea..65ca4f8e91 100644 --- a/dex2oat/linker/relative_patcher_test.h +++ b/dex2oat/linker/relative_patcher_test.h @@ -29,7 +29,7 @@ #include "driver/compiled_method-inl.h" #include "driver/compiled_method_storage.h" #include "linker/relative_patcher.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "stream/vector_output_stream.h" namespace art { diff --git a/dex2oat/linker/riscv64/relative_patcher_riscv64_test.cc b/dex2oat/linker/riscv64/relative_patcher_riscv64_test.cc index 9e30ffd4cb..e4af20b182 100644 --- a/dex2oat/linker/riscv64/relative_patcher_riscv64_test.cc +++ b/dex2oat/linker/riscv64/relative_patcher_riscv64_test.cc @@ -16,9 +16,9 @@ #include "relative_patcher_riscv64.h" -#include "oat_quick_method_header.h" #include "linker/linker_patch.h" #include "linker/relative_patcher_test.h" +#include "oat/oat_quick_method_header.h" namespace art { namespace linker { diff --git a/dexlayout/dexdiag_test.cc b/dexlayout/dexdiag_test.cc index 3cd80b409f..cdea3bc827 100644 --- a/dexlayout/dexdiag_test.cc +++ b/dexlayout/dexdiag_test.cc @@ -21,7 +21,7 @@ #include "base/file_utils.h" #include "base/os.h" #include "exec_utils.h" -#include "oat_file.h" +#include "oat/oat_file.h" namespace art { diff --git a/dexoptanalyzer/dexoptanalyzer.cc b/dexoptanalyzer/dexoptanalyzer.cc index b182f68a7f..2887dc9530 100644 --- a/dexoptanalyzer/dexoptanalyzer.cc +++ b/dexoptanalyzer/dexoptanalyzer.cc @@ -35,8 +35,8 @@ #include "gc/heap.h" #include "gc/space/image_space.h" #include "noop_compiler_callbacks.h" -#include "oat.h" -#include "oat_file_assistant.h" +#include "oat/oat.h" +#include "oat/oat_file_assistant.h" #include "runtime.h" #include "thread-inl.h" #include "vdex_file.h" diff --git a/imgdiag/imgdiag.cc b/imgdiag/imgdiag.cc index 91ee7d6f4b..adadfcf330 100644 --- a/imgdiag/imgdiag.cc +++ b/imgdiag/imgdiag.cc @@ -41,13 +41,13 @@ #include "cmdline.h" #include "gc/heap.h" #include "gc/space/image_space.h" -#include "image-inl.h" #include "mirror/class-inl.h" #include "mirror/object-inl.h" #include "mirror/object-refvisitor-inl.h" -#include "oat.h" -#include "oat_file.h" -#include "oat_file_manager.h" +#include "oat/image-inl.h" +#include "oat/oat.h" +#include "oat/oat_file.h" +#include "oat/oat_file_manager.h" #include "page_util.h" #include "procinfo/process_map.h" #include "scoped_thread_state_change-inl.h" diff --git a/oatdump/oatdump.cc b/oatdump/oatdump.cc index aedeeb2fe2..69dc23ae3d 100644 --- a/oatdump/oatdump.cc +++ b/oatdump/oatdump.cc @@ -72,23 +72,23 @@ #include "gc/space/image_space.h" #include "gc/space/large_object_space.h" #include "gc/space/space-inl.h" -#include "image-inl.h" #include "imtable-inl.h" -#include "index_bss_mapping.h" #include "interpreter/unstarted_runtime.h" #include "mirror/array-inl.h" #include "mirror/class-inl.h" #include "mirror/dex_cache-inl.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" -#include "oat.h" -#include "oat_file-inl.h" -#include "oat_file_assistant.h" -#include "oat_file_assistant_context.h" -#include "oat_file_manager.h" +#include "oat/image-inl.h" +#include "oat/index_bss_mapping.h" +#include "oat/oat.h" +#include "oat/oat_file-inl.h" +#include "oat/oat_file_assistant.h" +#include "oat/oat_file_assistant_context.h" +#include "oat/oat_file_manager.h" +#include "oat/stack_map.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" -#include "stack_map.h" #include "stream/buffered_output_stream.h" #include "stream/file_output_stream.h" #include "subtype_check.h" diff --git a/openjdkjvmti/deopt_manager.cc b/openjdkjvmti/deopt_manager.cc index 42ab5d30dc..6583e82253 100644 --- a/openjdkjvmti/deopt_manager.cc +++ b/openjdkjvmti/deopt_manager.cc @@ -52,7 +52,7 @@ #include "mirror/class-inl.h" #include "mirror/object_array-inl.h" #include "nativehelper/scoped_local_ref.h" -#include "oat_file_manager.h" +#include "oat/oat_file_manager.h" #include "read_barrier_config.h" #include "runtime_callbacks.h" #include "scoped_thread_state_change-inl.h" diff --git a/openjdkjvmti/ti_method.cc b/openjdkjvmti/ti_method.cc index b400513208..a460b39556 100644 --- a/openjdkjvmti/ti_method.cc +++ b/openjdkjvmti/ti_method.cc @@ -63,7 +63,7 @@ #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "nativehelper/scoped_local_ref.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "obj_ptr.h" #include "runtime.h" #include "runtime_callbacks.h" diff --git a/openjdkjvmti/transform.cc b/openjdkjvmti/transform.cc index d3448d9e65..1e5378dff9 100644 --- a/openjdkjvmti/transform.cc +++ b/openjdkjvmti/transform.cc @@ -60,7 +60,7 @@ #include "mirror/class_ext.h" #include "mirror/class_loader-inl.h" #include "mirror/string-inl.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" #include "thread_list.h" diff --git a/runtime/Android.bp b/runtime/Android.bp index 631b0df519..aee87ba0d9 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -231,9 +231,7 @@ cc_defaults { defaults: ["libart_common_defaults"], srcs: [ "app_info.cc", - "aot_class_linker.cc", "art_field.cc", - "sdk_checker.cc", "art_method.cc", "backtrace_helper.cc", "barrier.cc", @@ -254,18 +252,17 @@ cc_defaults { "debugger.cc", "dex/dex_file_annotations.cc", "dex_register_location.cc", - "elf_file.cc", "exec_utils.cc", "fault_handler.cc", - "gc/allocation_record.cc", - "gc/allocator/art-dlmalloc.cc", - "gc/allocator/rosalloc.cc", "gc/accounting/bitmap.cc", "gc/accounting/card_table.cc", "gc/accounting/heap_bitmap.cc", "gc/accounting/mod_union_table.cc", "gc/accounting/remembered_set.cc", "gc/accounting/space_bitmap.cc", + "gc/allocation_record.cc", + "gc/allocator/art-dlmalloc.cc", + "gc/allocator/rosalloc.cc", "gc/collector/concurrent_copying.cc", "gc/collector/garbage_collector.cc", "gc/collector/immune_region.cc", @@ -294,8 +291,6 @@ cc_defaults { "handle.cc", "hidden_api.cc", "hprof/hprof.cc", - "image.cc", - "index_bss_mapping.cc", "indirect_reference_table.cc", "instrumentation.cc", "intern_table.cc", @@ -313,8 +308,8 @@ cc_defaults { "jit/jit.cc", "jit/jit_code_cache.cc", "jit/jit_memory_region.cc", - "jit/profiling_info.cc", "jit/profile_saver.cc", + "jit/profiling_info.cc", "jit/small_pattern_matcher.cc", "jni/check_jni.cc", "jni/java_vm_ext.cc", @@ -343,10 +338,8 @@ cc_defaults { "mirror/var_handle.cc", "monitor.cc", "monitor_objects_stack_visitor.cc", - "native_bridge_art_interface.cc", - "native_stack_dump.cc", - "native/dalvik_system_DexFile.cc", "native/dalvik_system_BaseDexClassLoader.cc", + "native/dalvik_system_DexFile.cc", "native/dalvik_system_VMDebug.cc", "native/dalvik_system_VMRuntime.cc", "native/dalvik_system_VMStack.cc", @@ -372,20 +365,27 @@ cc_defaults { "native/java_lang_reflect_Parameter.cc", "native/java_lang_reflect_Proxy.cc", "native/java_util_concurrent_atomic_AtomicLong.cc", + "native/jdk_internal_misc_Unsafe.cc", "native/libcore_io_Memory.cc", "native/libcore_util_CharsetUtils.cc", "native/org_apache_harmony_dalvik_ddmc_DdmServer.cc", "native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc", "native/sun_misc_Unsafe.cc", - "native/jdk_internal_misc_Unsafe.cc", + "native_bridge_art_interface.cc", + "native_stack_dump.cc", "non_debuggable_classes.cc", "nterp_helpers.cc", - "oat.cc", - "oat_file.cc", - "oat_file_assistant.cc", - "oat_file_assistant_context.cc", - "oat_file_manager.cc", - "oat_quick_method_header.cc", + "oat/aot_class_linker.cc", + "oat/elf_file.cc", + "oat/image.cc", + "oat/index_bss_mapping.cc", + "oat/oat.cc", + "oat/oat_file.cc", + "oat/oat_file_assistant.cc", + "oat/oat_file_assistant_context.cc", + "oat/oat_file_manager.cc", + "oat/oat_quick_method_header.cc", + "oat/stack_map.cc", "object_lock.cc", "offsets.cc", "parsed_options.cc", @@ -403,9 +403,9 @@ cc_defaults { "runtime_intrinsics.cc", "runtime_options.cc", "scoped_thread_state_change.cc", + "sdk_checker.cc", "signal_catcher.cc", "stack.cc", - "stack_map.cc", "startup_completed_task.cc", "string_builder_append.cc", "thread.cc", @@ -728,24 +728,24 @@ gensrcs { "base/locks.h", "class_status.h", "compilation_kind.h", - "gc_root.h", - "gc/allocator_type.h", "gc/allocator/rosalloc.h", - "gc/collector_type.h", + "gc/allocator_type.h", "gc/collector/gc_type.h", "gc/collector/mark_compact.h", + "gc/collector_type.h", "gc/space/region_space.h", "gc/space/space.h", "gc/weak_root_state.h", - "image.h", - "instrumentation.h", + "gc_root.h", "indirect_reference_table.h", + "instrumentation.h", "jdwp_provider.h", "jni_id_type.h", "linear_alloc.h", "lock_word.h", - "oat.h", - "oat_file.h", + "oat/image.h", + "oat/oat.h", + "oat/oat_file.h", "process_state.h", "reflective_value_visitor.h", "stack.h", @@ -1001,7 +1001,7 @@ art_cc_defaults { "method_handles_test.cc", "mirror/object_test.cc", "mirror/var_handle_test.cc", - "oat_file_assistant_test.cc", + "oat/oat_file_assistant_test.cc", "runtime_callbacks_test.cc", "subtype_check_test.cc", "transaction_test.cc", @@ -1071,8 +1071,8 @@ art_cc_defaults { "monitor_pool_test.cc", "monitor_test.cc", "native_stack_dump_test.cc", - "oat_file_assistant_test.cc", - "oat_file_test.cc", + "oat/oat_file_assistant_test.cc", + "oat/oat_file_test.cc", "parsed_options_test.cc", "prebuilt_tools_test.cc", "proxy_test.cc", diff --git a/runtime/arch/x86/fault_handler_x86.cc b/runtime/arch/x86/fault_handler_x86.cc index 3737491cd4..83214664f3 100644 --- a/runtime/arch/x86/fault_handler_x86.cc +++ b/runtime/arch/x86/fault_handler_x86.cc @@ -24,7 +24,7 @@ #include "base/hex_dump.h" #include "base/logging.h" // For VLOG. #include "base/macros.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "runtime_globals.h" #include "thread-current-inl.h" diff --git a/runtime/art_method.cc b/runtime/art_method.cc index dee62659e3..8ceda0177f 100644 --- a/runtime/art_method.cc +++ b/runtime/art_method.cc @@ -48,7 +48,7 @@ #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "mirror/string.h" -#include "oat_file-inl.h" +#include "oat/oat_file-inl.h" #include "runtime_callbacks.h" #include "scoped_thread_state_change-inl.h" #include "vdex_file.h" diff --git a/runtime/cha.h b/runtime/cha.h index 5a403ec5cb..8d4c3c5a92 100644 --- a/runtime/cha.h +++ b/runtime/cha.h @@ -24,7 +24,7 @@ #include "base/locks.h" #include "handle.h" #include "mirror/class.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" namespace art { diff --git a/runtime/check_reference_map_visitor.h b/runtime/check_reference_map_visitor.h index d03139b555..de4986cb16 100644 --- a/runtime/check_reference_map_visitor.h +++ b/runtime/check_reference_map_visitor.h @@ -20,10 +20,10 @@ #include "art_method-inl.h" #include "dex/code_item_accessors-inl.h" #include "dex/dex_file_types.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" namespace art { diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 8639291fe9..0e8bfb0223 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -90,7 +90,6 @@ #include "gc_root-inl.h" #include "handle_scope-inl.h" #include "hidden_api.h" -#include "image-inl.h" #include "imt_conflict_table.h" #include "imtable-inl.h" #include "intern_table-inl.h" @@ -137,11 +136,12 @@ #include "nativehelper/scoped_local_ref.h" #include "nterp_helpers-inl.h" #include "nterp_helpers.h" -#include "oat.h" -#include "oat_file-inl.h" -#include "oat_file.h" -#include "oat_file_assistant.h" -#include "oat_file_manager.h" +#include "oat/image-inl.h" +#include "oat/oat.h" +#include "oat/oat_file-inl.h" +#include "oat/oat_file.h" +#include "oat/oat_file_assistant.h" +#include "oat/oat_file_manager.h" #include "object_lock.h" #include "profile/profile_compilation_info.h" #include "runtime.h" diff --git a/runtime/class_linker.h b/runtime/class_linker.h index f1cede1756..9fc937f08a 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -41,7 +41,7 @@ #include "jni.h" #include "mirror/class.h" #include "mirror/object.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "verifier/verifier_enums.h" namespace art { diff --git a/runtime/class_loader_context.cc b/runtime/class_loader_context.cc index e6cb6d6f8e..81eb11c1d3 100644 --- a/runtime/class_loader_context.cc +++ b/runtime/class_loader_context.cc @@ -40,7 +40,7 @@ #include "mirror/object.h" #include "mirror/object_array-alloc-inl.h" #include "nativehelper/scoped_local_ref.h" -#include "oat_file_assistant.h" +#include "oat/oat_file_assistant.h" #include "obj_ptr-inl.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" diff --git a/runtime/class_loader_context.h b/runtime/class_loader_context.h index 806ab5efec..cfb04578e3 100644 --- a/runtime/class_loader_context.h +++ b/runtime/class_loader_context.h @@ -26,7 +26,7 @@ #include "dex/dex_file.h" #include "handle_scope.h" #include "mirror/class_loader.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "scoped_thread_state_change.h" namespace art { diff --git a/runtime/class_loader_context_test.cc b/runtime/class_loader_context_test.cc index 2a6d87753a..1744e4ed1b 100644 --- a/runtime/class_loader_context_test.cc +++ b/runtime/class_loader_context_test.cc @@ -40,7 +40,7 @@ #include "mirror/class_loader-inl.h" #include "mirror/object-inl.h" #include "mirror/object_array-alloc-inl.h" -#include "oat_file_assistant.h" +#include "oat/oat_file_assistant.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" #include "thread.h" diff --git a/runtime/class_table-inl.h b/runtime/class_table-inl.h index 4ee59a79f7..55ecb78931 100644 --- a/runtime/class_table-inl.h +++ b/runtime/class_table-inl.h @@ -23,7 +23,7 @@ #include "dex/utf.h" #include "gc_root-inl.h" #include "mirror/class.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "obj_ptr-inl.h" namespace art { diff --git a/runtime/class_table.cc b/runtime/class_table.cc index 429f9268ec..12d0697e7b 100644 --- a/runtime/class_table.cc +++ b/runtime/class_table.cc @@ -19,7 +19,7 @@ #include "base/stl_util.h" #include "mirror/class-inl.h" #include "mirror/string-inl.h" -#include "oat_file.h" +#include "oat/oat_file.h" namespace art { diff --git a/runtime/debugger.cc b/runtime/debugger.cc index 3a30cb87e4..673379ce66 100644 --- a/runtime/debugger.cc +++ b/runtime/debugger.cc @@ -68,7 +68,7 @@ #include "mirror/throwable.h" #include "nativehelper/scoped_local_ref.h" #include "nativehelper/scoped_primitive_array.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "obj_ptr-inl.h" #include "reflection.h" #include "reflective_handle.h" diff --git a/runtime/dex/dex_file_annotations.cc b/runtime/dex/dex_file_annotations.cc index 76cea993b2..ab2384ee95 100644 --- a/runtime/dex/dex_file_annotations.cc +++ b/runtime/dex/dex_file_annotations.cc @@ -35,7 +35,7 @@ #include "mirror/method.h" #include "mirror/object_array-alloc-inl.h" #include "mirror/object_array-inl.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "obj_ptr-inl.h" #include "reflection.h" #include "thread.h" diff --git a/runtime/dex2oat_environment_test.h b/runtime/dex2oat_environment_test.h index 202f8cf92a..08b36bbb37 100644 --- a/runtime/dex2oat_environment_test.h +++ b/runtime/dex2oat_environment_test.h @@ -35,7 +35,7 @@ #include "gc/heap.h" #include "gc/space/image_space.h" #include "gtest/gtest.h" -#include "oat_file_assistant.h" +#include "oat/oat_file_assistant.h" #include "runtime.h" #include "ziparchive/zip_writer.h" diff --git a/runtime/dexopt_test.cc b/runtime/dexopt_test.cc index 970590fda8..edb28823c7 100644 --- a/runtime/dexopt_test.cc +++ b/runtime/dexopt_test.cc @@ -34,8 +34,8 @@ #include "dex2oat_environment_test.h" #include "gc/space/image_space.h" #include "hidden_api.h" -#include "oat.h" -#include "oat_file_assistant.h" +#include "oat/oat.h" +#include "oat/oat_file_assistant.h" #include "profile/profile_compilation_info.h" namespace art HIDDEN { 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" diff --git a/runtime/fault_handler.cc b/runtime/fault_handler.cc index 43dee0e6e8..ccf6fbd288 100644 --- a/runtime/fault_handler.cc +++ b/runtime/fault_handler.cc @@ -32,8 +32,8 @@ #include "jit/jit_code_cache.h" #include "mirror/class.h" #include "mirror/object_reference.h" -#include "oat_file.h" -#include "oat_quick_method_header.h" +#include "oat/oat_file.h" +#include "oat/oat_quick_method_header.h" #include "sigchain.h" #include "thread-current-inl.h" #include "verify_object-inl.h" diff --git a/runtime/gc/collector/concurrent_copying.cc b/runtime/gc/collector/concurrent_copying.cc index 4987ed07d5..32a13f0797 100644 --- a/runtime/gc/collector/concurrent_copying.cc +++ b/runtime/gc/collector/concurrent_copying.cc @@ -36,12 +36,12 @@ #include "gc/space/image_space.h" #include "gc/space/space-inl.h" #include "gc/verification.h" -#include "image-inl.h" #include "intern_table.h" #include "mirror/class-inl.h" #include "mirror/object-inl.h" #include "mirror/object-refvisitor-inl.h" #include "mirror/object_reference.h" +#include "oat/image-inl.h" #include "scoped_thread_state_change-inl.h" #include "thread-inl.h" #include "thread_list.h" diff --git a/runtime/gc/collector/immune_spaces.cc b/runtime/gc/collector/immune_spaces.cc index 28704af919..4128242cf7 100644 --- a/runtime/gc/collector/immune_spaces.cc +++ b/runtime/gc/collector/immune_spaces.cc @@ -22,7 +22,7 @@ #include "base/logging.h" // For VLOG. #include "gc/space/space-inl.h" #include "mirror/object.h" -#include "oat_file.h" +#include "oat/oat_file.h" namespace art HIDDEN { namespace gc { diff --git a/runtime/gc/collector/immune_spaces_test.cc b/runtime/gc/collector/immune_spaces_test.cc index cee3d242e6..6cc7e307af 100644 --- a/runtime/gc/collector/immune_spaces_test.cc +++ b/runtime/gc/collector/immune_spaces_test.cc @@ -21,7 +21,7 @@ #include "gc/collector/immune_spaces.h" #include "gc/space/image_space.h" #include "gc/space/space-inl.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "thread-current-inl.h" namespace art HIDDEN { diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc index b7821a3e98..9c23423276 100644 --- a/runtime/gc/heap.cc +++ b/runtime/gc/heap.cc @@ -80,7 +80,6 @@ #include "handle_scope-inl.h" #include "heap-inl.h" #include "heap-visit-objects-inl.h" -#include "image.h" #include "intern_table.h" #include "jit/jit.h" #include "jit/jit_code_cache.h" @@ -95,6 +94,7 @@ #include "mirror/reference-inl.h" #include "mirror/var_handle.h" #include "nativehelper/scoped_local_ref.h" +#include "oat/image.h" #include "obj_ptr-inl.h" #ifdef ART_TARGET_ANDROID #include "perfetto/heap_profile.h" diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc index 3314c14fca..e3e14cae76 100644 --- a/runtime/gc/space/image_space.cc +++ b/runtime/gc/space/image_space.cc @@ -55,16 +55,16 @@ #include "exec_utils.h" #include "gc/accounting/space_bitmap-inl.h" #include "gc/task_processor.h" -#include "image-inl.h" -#include "image.h" #include "intern_table-inl.h" #include "mirror/class-inl.h" #include "mirror/executable-inl.h" #include "mirror/object-inl.h" #include "mirror/object-refvisitor-inl.h" #include "mirror/var_handle.h" -#include "oat.h" -#include "oat_file.h" +#include "oat/image-inl.h" +#include "oat/image.h" +#include "oat/oat.h" +#include "oat/oat_file.h" #include "profile/profile_compilation_info.h" #include "runtime.h" #include "space-inl.h" diff --git a/runtime/gc/space/image_space.h b/runtime/gc/space/image_space.h index 63a47c86c1..3b59ffd758 100644 --- a/runtime/gc/space/image_space.h +++ b/runtime/gc/space/image_space.h @@ -20,7 +20,7 @@ #include "android-base/unique_fd.h" #include "base/array_ref.h" #include "gc/accounting/space_bitmap.h" -#include "image.h" +#include "oat/image.h" #include "runtime.h" #include "space.h" diff --git a/runtime/gc/space/image_space_test.cc b/runtime/gc/space/image_space_test.cc index e6b758fe55..4f6c4e9633 100644 --- a/runtime/gc/space/image_space_test.cc +++ b/runtime/gc/space/image_space_test.cc @@ -26,7 +26,7 @@ #include "dexopt_test.h" #include "intern_table-inl.h" #include "noop_compiler_callbacks.h" -#include "oat_file.h" +#include "oat/oat_file.h" namespace art HIDDEN { namespace gc { diff --git a/runtime/gc/space/large_object_space.cc b/runtime/gc/space/large_object_space.cc index 3d9fd5a620..a4b9d24184 100644 --- a/runtime/gc/space/large_object_space.cc +++ b/runtime/gc/space/large_object_space.cc @@ -30,8 +30,8 @@ #include "gc/accounting/heap_bitmap-inl.h" #include "gc/accounting/space_bitmap-inl.h" #include "gc/heap.h" -#include "image.h" #include "mirror/object-readbarrier-inl.h" +#include "oat/image.h" #include "scoped_thread_state_change-inl.h" #include "space-inl.h" #include "thread-current-inl.h" diff --git a/runtime/hidden_api.cc b/runtime/hidden_api.cc index b6cca33c21..c2884d65fc 100644 --- a/runtime/hidden_api.cc +++ b/runtime/hidden_api.cc @@ -29,7 +29,7 @@ #include "mirror/class_ext.h" #include "mirror/proxy.h" #include "nativehelper/scoped_local_ref.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "scoped_thread_state_change.h" #include "stack.h" #include "thread-inl.h" diff --git a/runtime/instrumentation.cc b/runtime/instrumentation.cc index 8bd83d9214..77436fc70f 100644 --- a/runtime/instrumentation.cc +++ b/runtime/instrumentation.cc @@ -48,8 +48,8 @@ #include "mirror/object_array-inl.h" #include "nterp_helpers.h" #include "nth_caller_visitor.h" -#include "oat_file_manager.h" -#include "oat_quick_method_header.h" +#include "oat/oat_file_manager.h" +#include "oat/oat_quick_method_header.h" #include "runtime-inl.h" #include "thread.h" #include "thread_list.h" diff --git a/runtime/intern_table-inl.h b/runtime/intern_table-inl.h index 84b730e2b6..b9aee25a14 100644 --- a/runtime/intern_table-inl.h +++ b/runtime/intern_table-inl.h @@ -22,8 +22,8 @@ #include "dex/utf.h" #include "gc/space/image_space.h" #include "gc_root-inl.h" -#include "image.h" #include "mirror/string-inl.h" +#include "oat/image.h" #include "thread-current-inl.h" namespace art { diff --git a/runtime/intern_table.cc b/runtime/intern_table.cc index 10b2d65f45..debb019569 100644 --- a/runtime/intern_table.cc +++ b/runtime/intern_table.cc @@ -24,11 +24,11 @@ #include "gc/weak_root_state.h" #include "gc_root-inl.h" #include "handle_scope-inl.h" -#include "image-inl.h" #include "mirror/dex_cache-inl.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "mirror/string-inl.h" +#include "oat/image-inl.h" #include "object_callbacks.h" #include "scoped_thread_state_change-inl.h" #include "thread.h" diff --git a/runtime/jit/jit.cc b/runtime/jit/jit.cc index 4d4a1ed79c..ecbab7068e 100644 --- a/runtime/jit/jit.cc +++ b/runtime/jit/jit.cc @@ -31,28 +31,28 @@ #include "compilation_kind.h" #include "debugger.h" #include "dex/type_lookup_table.h" -#include "gc/space/image_space.h" #include "entrypoints/entrypoint_utils-inl.h" #include "entrypoints/runtime_asm_entrypoints.h" -#include "image-inl.h" +#include "gc/space/image_space.h" #include "interpreter/interpreter.h" #include "jit-inl.h" #include "jit_code_cache.h" #include "jit_create.h" -#include "small_pattern_matcher.h" #include "jni/java_vm_ext.h" #include "mirror/method_handle_impl.h" #include "mirror/var_handle.h" -#include "oat_file.h" -#include "oat_file_manager.h" -#include "oat_quick_method_header.h" +#include "oat/image-inl.h" +#include "oat/oat_file.h" +#include "oat/oat_file_manager.h" +#include "oat/oat_quick_method_header.h" +#include "oat/stack_map.h" #include "profile/profile_boot_info.h" #include "profile/profile_compilation_info.h" #include "profile_saver.h" #include "runtime.h" #include "runtime_options.h" +#include "small_pattern_matcher.h" #include "stack.h" -#include "stack_map.h" #include "thread-inl.h" #include "thread_list.h" diff --git a/runtime/jit/jit_code_cache.cc b/runtime/jit/jit_code_cache.cc index f44b822bb1..7bfbe15059 100644 --- a/runtime/jit/jit_code_cache.cc +++ b/runtime/jit/jit_code_cache.cc @@ -50,8 +50,8 @@ #include "jit/profiling_info.h" #include "jit/jit_scoped_code_cache_write.h" #include "linear_alloc.h" -#include "oat_file-inl.h" -#include "oat_quick_method_header.h" +#include "oat/oat_file-inl.h" +#include "oat/oat_quick_method_header.h" #include "object_callbacks.h" #include "profile/profile_compilation_info.h" #include "scoped_thread_state_change-inl.h" diff --git a/runtime/jit/jit_memory_region.cc b/runtime/jit/jit_memory_region.cc index 3a4ef973eb..e3a97efac0 100644 --- a/runtime/jit/jit_memory_region.cc +++ b/runtime/jit/jit_memory_region.cc @@ -29,7 +29,7 @@ #include "base/systrace.h" #include "gc/allocator/art-dlmalloc.h" #include "jit/jit_scoped_code_cache_write.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "palette/palette.h" using android::base::unique_fd; diff --git a/runtime/jit/profile_saver.cc b/runtime/jit/profile_saver.cc index 91b011bce8..759e946dce 100644 --- a/runtime/jit/profile_saver.cc +++ b/runtime/jit/profile_saver.cc @@ -39,7 +39,7 @@ #include "gc/gc_cause.h" #include "jit/jit.h" #include "jit/profiling_info.h" -#include "oat_file_manager.h" +#include "oat/oat_file_manager.h" #include "profile/profile_compilation_info.h" #include "scoped_thread_state_change-inl.h" diff --git a/runtime/metrics/reporter.cc b/runtime/metrics/reporter.cc index 1c706af39d..d8cb69a310 100644 --- a/runtime/metrics/reporter.cc +++ b/runtime/metrics/reporter.cc @@ -22,7 +22,7 @@ #include "base/flags.h" #include "base/stl_util.h" -#include "oat_file_manager.h" +#include "oat/oat_file_manager.h" #include "runtime.h" #include "runtime_options.h" #include "statsd.h" diff --git a/runtime/mirror/dex_cache.cc b/runtime/mirror/dex_cache.cc index d3f474e588..3b887668a3 100644 --- a/runtime/mirror/dex_cache.cc +++ b/runtime/mirror/dex_cache.cc @@ -22,7 +22,7 @@ #include "gc/heap.h" #include "jit/profile_saver.h" #include "linear_alloc.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "object-inl.h" #include "object.h" #include "object_array-inl.h" diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc index f1c5d541a9..f7f446542c 100644 --- a/runtime/native/dalvik_system_DexFile.cc +++ b/runtime/native/dalvik_system_DexFile.cc @@ -49,9 +49,9 @@ #include "nativehelper/jni_macros.h" #include "nativehelper/scoped_local_ref.h" #include "nativehelper/scoped_utf_chars.h" -#include "oat_file.h" -#include "oat_file_assistant.h" -#include "oat_file_manager.h" +#include "oat/oat_file.h" +#include "oat/oat_file_assistant.h" +#include "oat/oat_file_manager.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" #include "string_array_utils.h" diff --git a/runtime/native/dalvik_system_ZygoteHooks.cc b/runtime/native/dalvik_system_ZygoteHooks.cc index cc47032bd4..3af197866b 100644 --- a/runtime/native/dalvik_system_ZygoteHooks.cc +++ b/runtime/native/dalvik_system_ZygoteHooks.cc @@ -36,8 +36,8 @@ #include "nativehelper/jni_macros.h" #include "nativehelper/scoped_utf_chars.h" #include "non_debuggable_classes.h" -#include "oat_file.h" -#include "oat_file_manager.h" +#include "oat/oat_file.h" +#include "oat/oat_file_manager.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" #include "startup_completed_task.h" diff --git a/runtime/native_stack_dump.cc b/runtime/native_stack_dump.cc index bda912eceb..d8ff871d87 100644 --- a/runtime/native_stack_dump.cc +++ b/runtime/native_stack_dump.cc @@ -53,7 +53,7 @@ #include "base/utils.h" #include "class_linker.h" #include "entrypoints/runtime_asm_entrypoints.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "runtime.h" #include "thread-current-inl.h" diff --git a/runtime/nterp_helpers.cc b/runtime/nterp_helpers.cc index 28c000303c..b39cbef10e 100644 --- a/runtime/nterp_helpers.cc +++ b/runtime/nterp_helpers.cc @@ -20,7 +20,7 @@ #include "entrypoints/quick/callee_save_frame.h" #include "interpreter/mterp/nterp.h" #include "nterp_helpers.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "quick/quick_method_frame_info.h" namespace art { diff --git a/runtime/aot_class_linker.cc b/runtime/oat/aot_class_linker.cc index dfdc3d73c5..dfdc3d73c5 100644 --- a/runtime/aot_class_linker.cc +++ b/runtime/oat/aot_class_linker.cc diff --git a/runtime/aot_class_linker.h b/runtime/oat/aot_class_linker.h index 1cf91636bb..16290de5fc 100644 --- a/runtime/aot_class_linker.h +++ b/runtime/oat/aot_class_linker.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_AOT_CLASS_LINKER_H_ -#define ART_RUNTIME_AOT_CLASS_LINKER_H_ +#ifndef ART_RUNTIME_OAT_AOT_CLASS_LINKER_H_ +#define ART_RUNTIME_OAT_AOT_CLASS_LINKER_H_ #include "base/macros.h" #include "sdk_checker.h" @@ -27,6 +27,7 @@ namespace gc { class Heap; } // namespace gc +// TODO: move to dex2oat/. // AotClassLinker is only used for AOT compiler, which includes some logic for class initialization // which will only be used in pre-compilation. class AotClassLinker : public ClassLinker { @@ -79,4 +80,4 @@ class AotClassLinker : public ClassLinker { } // namespace art -#endif // ART_RUNTIME_AOT_CLASS_LINKER_H_ +#endif // ART_RUNTIME_OAT_AOT_CLASS_LINKER_H_ diff --git a/runtime/elf_file.cc b/runtime/oat/elf_file.cc index 96d7d0f4ac..96d7d0f4ac 100644 --- a/runtime/elf_file.cc +++ b/runtime/oat/elf_file.cc diff --git a/runtime/elf_file.h b/runtime/oat/elf_file.h index 4e45f1321e..a9218106de 100644 --- a/runtime/elf_file.h +++ b/runtime/oat/elf_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_ELF_FILE_H_ -#define ART_RUNTIME_ELF_FILE_H_ +#ifndef ART_RUNTIME_OAT_ELF_FILE_H_ +#define ART_RUNTIME_OAT_ELF_FILE_H_ #include <memory> #include <string> @@ -110,4 +110,4 @@ class ElfFile { } // namespace art -#endif // ART_RUNTIME_ELF_FILE_H_ +#endif // ART_RUNTIME_OAT_ELF_FILE_H_ diff --git a/runtime/elf_file_impl.h b/runtime/oat/elf_file_impl.h index b2152c783e..ffc6a2c081 100644 --- a/runtime/elf_file_impl.h +++ b/runtime/oat/elf_file_impl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_ELF_FILE_IMPL_H_ -#define ART_RUNTIME_ELF_FILE_IMPL_H_ +#ifndef ART_RUNTIME_OAT_ELF_FILE_IMPL_H_ +#define ART_RUNTIME_OAT_ELF_FILE_IMPL_H_ #include <map> #include <memory> @@ -222,4 +222,4 @@ class ElfFileImpl { } // namespace art -#endif // ART_RUNTIME_ELF_FILE_IMPL_H_ +#endif // ART_RUNTIME_OAT_ELF_FILE_IMPL_H_ diff --git a/runtime/image-inl.h b/runtime/oat/image-inl.h index 0404e99bef..b8664da269 100644 --- a/runtime/image-inl.h +++ b/runtime/oat/image-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_IMAGE_INL_H_ -#define ART_RUNTIME_IMAGE_INL_H_ +#ifndef ART_RUNTIME_OAT_IMAGE_INL_H_ +#define ART_RUNTIME_OAT_IMAGE_INL_H_ #include "image.h" @@ -117,4 +117,4 @@ inline void ImageHeader::VisitPackedImtConflictTables(const Visitor& visitor, } // namespace art -#endif // ART_RUNTIME_IMAGE_INL_H_ +#endif // ART_RUNTIME_OAT_IMAGE_INL_H_ diff --git a/runtime/image.cc b/runtime/oat/image.cc index ae602ece05..ae602ece05 100644 --- a/runtime/image.cc +++ b/runtime/oat/image.cc diff --git a/runtime/image.h b/runtime/oat/image.h index 5580e273c5..3bcbdd9db3 100644 --- a/runtime/image.h +++ b/runtime/oat/image.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_IMAGE_H_ -#define ART_RUNTIME_IMAGE_H_ +#ifndef ART_RUNTIME_OAT_IMAGE_H_ +#define ART_RUNTIME_OAT_IMAGE_H_ #include <string.h> @@ -606,4 +606,4 @@ bool LZ4_decompress_safe_checked(const char* source, } // namespace art -#endif // ART_RUNTIME_IMAGE_H_ +#endif // ART_RUNTIME_OAT_IMAGE_H_ diff --git a/runtime/index_bss_mapping.cc b/runtime/oat/index_bss_mapping.cc index f6e083d613..f6e083d613 100644 --- a/runtime/index_bss_mapping.cc +++ b/runtime/oat/index_bss_mapping.cc diff --git a/runtime/index_bss_mapping.h b/runtime/oat/index_bss_mapping.h index dcbc05c195..bc8db33fc9 100644 --- a/runtime/index_bss_mapping.h +++ b/runtime/oat/index_bss_mapping.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_INDEX_BSS_MAPPING_H_ -#define ART_RUNTIME_INDEX_BSS_MAPPING_H_ +#ifndef ART_RUNTIME_OAT_INDEX_BSS_MAPPING_H_ +#define ART_RUNTIME_OAT_INDEX_BSS_MAPPING_H_ #include <android-base/logging.h> @@ -79,4 +79,4 @@ class IndexBssMappingLookup { } // namespace art -#endif // ART_RUNTIME_INDEX_BSS_MAPPING_H_ +#endif // ART_RUNTIME_OAT_INDEX_BSS_MAPPING_H_ diff --git a/runtime/oat.cc b/runtime/oat/oat.cc index e83d27736c..e83d27736c 100644 --- a/runtime/oat.cc +++ b/runtime/oat/oat.cc diff --git a/runtime/oat.h b/runtime/oat/oat.h index 7ea97fd9b1..6db50e3b7b 100644 --- a/runtime/oat.h +++ b/runtime/oat/oat.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_OAT_H_ -#define ART_RUNTIME_OAT_H_ +#ifndef ART_RUNTIME_OAT_OAT_H_ +#define ART_RUNTIME_OAT_OAT_H_ #include <array> #include <vector> @@ -164,4 +164,4 @@ class PACKED(4) OatHeader { } // namespace art -#endif // ART_RUNTIME_OAT_H_ +#endif // ART_RUNTIME_OAT_OAT_H_ diff --git a/runtime/oat_file-inl.h b/runtime/oat/oat_file-inl.h index fd42e45dce..eeb94d7260 100644 --- a/runtime/oat_file-inl.h +++ b/runtime/oat/oat_file-inl.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_OAT_FILE_INL_H_ -#define ART_RUNTIME_OAT_FILE_INL_H_ +#ifndef ART_RUNTIME_OAT_OAT_FILE_INL_H_ +#define ART_RUNTIME_OAT_OAT_FILE_INL_H_ #include "oat_file.h" @@ -114,4 +114,4 @@ inline const OatFile::BssMappingInfo* OatFile::FindBcpMappingInfo(const DexFile* } // namespace art -#endif // ART_RUNTIME_OAT_FILE_INL_H_ +#endif // ART_RUNTIME_OAT_OAT_FILE_INL_H_ diff --git a/runtime/oat_file.cc b/runtime/oat/oat_file.cc index ce2d4fec7b..ce2d4fec7b 100644 --- a/runtime/oat_file.cc +++ b/runtime/oat/oat_file.cc diff --git a/runtime/oat_file.h b/runtime/oat/oat_file.h index 2af1921f0e..9ce6547e38 100644 --- a/runtime/oat_file.h +++ b/runtime/oat/oat_file.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_OAT_FILE_H_ -#define ART_RUNTIME_OAT_FILE_H_ +#ifndef ART_RUNTIME_OAT_OAT_FILE_H_ +#define ART_RUNTIME_OAT_OAT_FILE_H_ #include <list> #include <memory> @@ -662,4 +662,4 @@ class OatDexFile final { } // namespace art -#endif // ART_RUNTIME_OAT_FILE_H_ +#endif // ART_RUNTIME_OAT_OAT_FILE_H_ diff --git a/runtime/oat_file_assistant.cc b/runtime/oat/oat_file_assistant.cc index 41f7709979..41f7709979 100644 --- a/runtime/oat_file_assistant.cc +++ b/runtime/oat/oat_file_assistant.cc diff --git a/runtime/oat_file_assistant.h b/runtime/oat/oat_file_assistant.h index c8337f82f2..01fe7c5aad 100644 --- a/runtime/oat_file_assistant.h +++ b/runtime/oat/oat_file_assistant.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_OAT_FILE_ASSISTANT_H_ -#define ART_RUNTIME_OAT_FILE_ASSISTANT_H_ +#ifndef ART_RUNTIME_OAT_OAT_FILE_ASSISTANT_H_ +#define ART_RUNTIME_OAT_OAT_FILE_ASSISTANT_H_ #include <cstdint> #include <memory> @@ -591,4 +591,4 @@ std::ostream& operator << (std::ostream& stream, const OatFileAssistant::OatStat } // namespace art -#endif // ART_RUNTIME_OAT_FILE_ASSISTANT_H_ +#endif // ART_RUNTIME_OAT_OAT_FILE_ASSISTANT_H_ diff --git a/runtime/oat_file_assistant_context.cc b/runtime/oat/oat_file_assistant_context.cc index 0e53c5cf38..0e53c5cf38 100644 --- a/runtime/oat_file_assistant_context.cc +++ b/runtime/oat/oat_file_assistant_context.cc diff --git a/runtime/oat_file_assistant_context.h b/runtime/oat/oat_file_assistant_context.h index d1dd920800..3029bbd25d 100644 --- a/runtime/oat_file_assistant_context.h +++ b/runtime/oat/oat_file_assistant_context.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_OAT_FILE_ASSISTANT_CONTEXT_H_ -#define ART_RUNTIME_OAT_FILE_ASSISTANT_CONTEXT_H_ +#ifndef ART_RUNTIME_OAT_OAT_FILE_ASSISTANT_CONTEXT_H_ +#define ART_RUNTIME_OAT_OAT_FILE_ASSISTANT_CONTEXT_H_ #include <optional> #include <string> @@ -86,4 +86,4 @@ class OatFileAssistantContext { } // namespace art -#endif // ART_RUNTIME_OAT_FILE_ASSISTANT_CONTEXT_H_ +#endif // ART_RUNTIME_OAT_OAT_FILE_ASSISTANT_CONTEXT_H_ diff --git a/runtime/oat_file_assistant_test.cc b/runtime/oat/oat_file_assistant_test.cc index 132640d440..132640d440 100644 --- a/runtime/oat_file_assistant_test.cc +++ b/runtime/oat/oat_file_assistant_test.cc diff --git a/runtime/oat_file_manager.cc b/runtime/oat/oat_file_manager.cc index f7b8e7d989..f7b8e7d989 100644 --- a/runtime/oat_file_manager.cc +++ b/runtime/oat/oat_file_manager.cc diff --git a/runtime/oat_file_manager.h b/runtime/oat/oat_file_manager.h index d812829a83..ecf285bb8a 100644 --- a/runtime/oat_file_manager.h +++ b/runtime/oat/oat_file_manager.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_OAT_FILE_MANAGER_H_ -#define ART_RUNTIME_OAT_FILE_MANAGER_H_ +#ifndef ART_RUNTIME_OAT_OAT_FILE_MANAGER_H_ +#define ART_RUNTIME_OAT_OAT_FILE_MANAGER_H_ #include <memory> #include <set> @@ -174,4 +174,4 @@ class OatFileManager { } // namespace art -#endif // ART_RUNTIME_OAT_FILE_MANAGER_H_ +#endif // ART_RUNTIME_OAT_OAT_FILE_MANAGER_H_ diff --git a/runtime/oat_file_test.cc b/runtime/oat/oat_file_test.cc index 80265f77f5..80265f77f5 100644 --- a/runtime/oat_file_test.cc +++ b/runtime/oat/oat_file_test.cc diff --git a/runtime/oat_quick_method_header.cc b/runtime/oat/oat_quick_method_header.cc index 33cb152810..33cb152810 100644 --- a/runtime/oat_quick_method_header.cc +++ b/runtime/oat/oat_quick_method_header.cc diff --git a/runtime/oat_quick_method_header.h b/runtime/oat/oat_quick_method_header.h index c596a93d36..07b320fcbe 100644 --- a/runtime/oat_quick_method_header.h +++ b/runtime/oat/oat_quick_method_header.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_OAT_QUICK_METHOD_HEADER_H_ -#define ART_RUNTIME_OAT_QUICK_METHOD_HEADER_H_ +#ifndef ART_RUNTIME_OAT_OAT_QUICK_METHOD_HEADER_H_ +#define ART_RUNTIME_OAT_OAT_QUICK_METHOD_HEADER_H_ #include <optional> @@ -202,4 +202,4 @@ class PACKED(4) OatQuickMethodHeader { } // namespace art -#endif // ART_RUNTIME_OAT_QUICK_METHOD_HEADER_H_ +#endif // ART_RUNTIME_OAT_OAT_QUICK_METHOD_HEADER_H_ diff --git a/runtime/stack_map.cc b/runtime/oat/stack_map.cc index 2c311fb85e..2c311fb85e 100644 --- a/runtime/stack_map.cc +++ b/runtime/oat/stack_map.cc diff --git a/runtime/stack_map.h b/runtime/oat/stack_map.h index 0f25243228..be7c11dfab 100644 --- a/runtime/stack_map.h +++ b/runtime/oat/stack_map.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ART_RUNTIME_STACK_MAP_H_ -#define ART_RUNTIME_STACK_MAP_H_ +#ifndef ART_RUNTIME_OAT_STACK_MAP_H_ +#define ART_RUNTIME_OAT_STACK_MAP_H_ #include <limits> @@ -601,4 +601,4 @@ class CodeInfo { } // namespace art -#endif // ART_RUNTIME_STACK_MAP_H_ +#endif // ART_RUNTIME_OAT_STACK_MAP_H_ diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc index 590a596c1f..05a10485f6 100644 --- a/runtime/quick_exception_handler.cc +++ b/runtime/quick_exception_handler.cc @@ -41,9 +41,9 @@ #include "mirror/class_loader.h" #include "mirror/throwable.h" #include "nterp_helpers.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" +#include "oat/stack_map.h" #include "stack.h" -#include "stack_map.h" namespace art { diff --git a/runtime/quick_exception_handler.h b/runtime/quick_exception_handler.h index 39462e55b4..9a5f66f9fe 100644 --- a/runtime/quick_exception_handler.h +++ b/runtime/quick_exception_handler.h @@ -25,7 +25,7 @@ #include "base/macros.h" #include "base/mutex.h" #include "deoptimization_kind.h" -#include "stack_map.h" +#include "oat/stack_map.h" #include "stack_reference.h" namespace art { diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 4875c75215..8cd192f09f 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -42,7 +42,6 @@ #include "android-base/strings.h" -#include "aot_class_linker.h" #include "arch/arm/registers_arm.h" #include "arch/arm64/registers_arm64.h" #include "arch/context.h" @@ -76,7 +75,6 @@ #include "debugger.h" #include "dex/art_dex_file_loader.h" #include "dex/dex_file_loader.h" -#include "elf_file.h" #include "entrypoints/runtime_asm_entrypoints.h" #include "entrypoints/entrypoint_utils-inl.h" #include "experimental_flags.h" @@ -90,7 +88,6 @@ #include "gc/task_processor.h" #include "handle_scope-inl.h" #include "hidden_api.h" -#include "image-inl.h" #include "indirect_reference_table.h" #include "instrumentation.h" #include "intern_table-inl.h" @@ -156,9 +153,12 @@ #include "native_stack_dump.h" #include "nativehelper/scoped_local_ref.h" #include "nterp_helpers.h" -#include "oat.h" -#include "oat_file_manager.h" -#include "oat_quick_method_header.h" +#include "oat/aot_class_linker.h" +#include "oat/elf_file.h" +#include "oat/image-inl.h" +#include "oat/oat.h" +#include "oat/oat_file_manager.h" +#include "oat/oat_quick_method_header.h" #include "object_callbacks.h" #include "odr_statslog/odr_statslog.h" #include "parsed_options.h" diff --git a/runtime/runtime_image.cc b/runtime/runtime_image.cc index 73bb9560fc..cae4ef8015 100644 --- a/runtime/runtime_image.cc +++ b/runtime/runtime_image.cc @@ -38,7 +38,6 @@ #include "class_root-inl.h" #include "dex/class_accessor-inl.h" #include "gc/space/image_space.h" -#include "image.h" #include "mirror/object-inl.h" #include "mirror/object-refvisitor-inl.h" #include "mirror/object_array-alloc-inl.h" @@ -46,7 +45,8 @@ #include "mirror/object_array.h" #include "mirror/string-inl.h" #include "nterp_helpers.h" -#include "oat.h" +#include "oat/image.h" +#include "oat/oat.h" #include "profile/profile_compilation_info.h" #include "scoped_thread_state_change-inl.h" #include "vdex_file.h" diff --git a/runtime/stack.cc b/runtime/stack.cc index bf844b48e4..4bd2719f44 100644 --- a/runtime/stack.cc +++ b/runtime/stack.cc @@ -40,7 +40,7 @@ #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "nterp_helpers.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" #include "obj_ptr-inl.h" #include "quick/quick_method_frame_info.h" #include "runtime.h" diff --git a/runtime/stack.h b/runtime/stack.h index a4bcf17ca5..46f0d084fe 100644 --- a/runtime/stack.h +++ b/runtime/stack.h @@ -25,9 +25,9 @@ #include "base/locks.h" #include "base/macros.h" #include "deoptimization_kind.h" +#include "oat/stack_map.h" #include "obj_ptr.h" #include "quick/quick_method_frame_info.h" -#include "stack_map.h" namespace art { diff --git a/runtime/thread.cc b/runtime/thread.cc index 46856e3e99..ee79281731 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -91,7 +91,8 @@ #include "nativehelper/scoped_utf_chars.h" #include "nterp_helpers.h" #include "nth_caller_visitor.h" -#include "oat_quick_method_header.h" +#include "oat/oat_quick_method_header.h" +#include "oat/stack_map.h" #include "obj_ptr-inl.h" #include "object_lock.h" #include "palette/palette.h" @@ -106,7 +107,6 @@ #include "scoped_thread_state_change-inl.h" #include "scoped_disable_public_sdk_checker.h" #include "stack.h" -#include "stack_map.h" #include "thread-inl.h" #include "thread_list.h" #include "trace.h" diff --git a/runtime/transaction.cc b/runtime/transaction.cc index 08452bd102..f22d71f92d 100644 --- a/runtime/transaction.cc +++ b/runtime/transaction.cc @@ -18,7 +18,6 @@ #include <android-base/logging.h> -#include "aot_class_linker.h" #include "base/mutex-inl.h" #include "base/stl_util.h" #include "dex/descriptors_names.h" @@ -30,6 +29,7 @@ #include "mirror/dex_cache-inl.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" +#include "oat/aot_class_linker.h" #include "obj_ptr-inl.h" #include "runtime.h" diff --git a/runtime/verifier/verifier_deps.cc b/runtime/verifier/verifier_deps.cc index 6740446c3d..ffd5206cbe 100644 --- a/runtime/verifier/verifier_deps.cc +++ b/runtime/verifier/verifier_deps.cc @@ -29,7 +29,7 @@ #include "dex/dex_file-inl.h" #include "mirror/class-inl.h" #include "mirror/class_loader.h" -#include "oat_file.h" +#include "oat/oat_file.h" #include "obj_ptr-inl.h" #include "reg_type.h" #include "reg_type_cache-inl.h" 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 { |