Create dex subdirectory
Move all the DexFile related source to a common subdirectory dex/ of
runtime.
Bug: 71361973
Test: make -j 50 test-art-host
Change-Id: I59e984ed660b93e0776556308be3d653722f5223
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 8fe901d..2657f4f 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -48,7 +48,6 @@
"base/timing_logger.cc",
"base/unix_file/fd_file.cc",
"base/unix_file/random_access_file_utils.cc",
- "cdex/compact_dex_file.cc",
"cha.cc",
"check_jni.cc",
"class_linker.cc",
@@ -57,14 +56,16 @@
"common_throws.cc",
"compiler_filter.cc",
"debugger.cc",
- "dex_file.cc",
- "dex_file_annotations.cc",
- "dex_file_exception_helpers.cc",
- "dex_file_loader.cc",
- "dex_file_layout.cc",
- "dex_file_tracking_registrar.cc",
- "dex_file_verifier.cc",
- "dex_instruction.cc",
+ "dex/compact_dex_file.cc",
+ "dex/dex_file.cc",
+ "dex/dex_file_annotations.cc",
+ "dex/dex_file_exception_helpers.cc",
+ "dex/dex_file_layout.cc",
+ "dex/dex_file_loader.cc",
+ "dex/dex_file_tracking_registrar.cc",
+ "dex/dex_file_verifier.cc",
+ "dex/dex_instruction.cc",
+ "dex/standard_dex_file.cc",
"dex_to_dex_decompiler.cc",
"elf_file.cc",
"exec_utils.cc",
@@ -214,7 +215,6 @@
"signal_catcher.cc",
"stack.cc",
"stack_map.cc",
- "standard_dex_file.cc",
"thread.cc",
"thread_list.cc",
"thread_pool.cc",
@@ -454,10 +454,10 @@
"debugger.h",
"base/unix_file/fd_file.h",
"class_status.h",
- "dex_file.h",
- "dex_file_layout.h",
- "dex_instruction.h",
- "dex_instruction_utils.h",
+ "dex/dex_file.h",
+ "dex/dex_file_layout.h",
+ "dex/dex_instruction.h",
+ "dex/dex_instruction_utils.h",
"gc_root.h",
"gc/allocator_type.h",
"gc/allocator/rosalloc.h",
@@ -566,16 +566,16 @@
"base/transform_iterator_test.cc",
"base/variant_map_test.cc",
"base/unix_file/fd_file_test.cc",
- "cdex/compact_dex_file_test.cc",
"cha_test.cc",
"class_linker_test.cc",
"class_loader_context_test.cc",
"class_table_test.cc",
- "code_item_accessors_test.cc",
"compiler_filter_test.cc",
- "dex_file_test.cc",
- "dex_file_verifier_test.cc",
- "dex_instruction_test.cc",
+ "dex/code_item_accessors_test.cc",
+ "dex/compact_dex_file_test.cc",
+ "dex/dex_file_test.cc",
+ "dex/dex_file_verifier_test.cc",
+ "dex/dex_instruction_test.cc",
"entrypoints/math_entrypoints_test.cc",
"entrypoints/quick/quick_trampoline_entrypoints_test.cc",
"entrypoints_order_test.cc",