Move files related to compiled code into oat/ directory

Test: art/test.py -b --host
Change-Id: Icedd3a82c6bca5147c3bc9dc50de5a729003d66f

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"

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"
 

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"

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"

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)

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"

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 {

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 {

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 {

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 {

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 {

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 {

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"

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 {

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"

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"

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"

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"

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"
 

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"

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).

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"

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 {
 

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 {
 

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"

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"

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 {
 

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"

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"

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 {

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"
 

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"
 

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"
 

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 {

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 {

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 {