ART: Allow to change boot image pickup order
Allow to change the pickup order of boot image files between
system-first and data-first.
Bug: 126307038
Test: m test-art-host
Test: Boot device with image in /data/dalvik-cache
Change-Id: Id80cfc06aeb023559e1a3706833e57ba4880f43b
diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 5c171e6..6f72740 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -205,7 +205,8 @@
bool use_generational_cc,
uint64_t min_interval_homogeneous_space_compaction_by_oom,
bool dump_region_info_before_gc,
- bool dump_region_info_after_gc)
+ bool dump_region_info_after_gc,
+ space::ImageSpaceLoadingOrder image_space_loading_order)
: non_moving_space_(nullptr),
rosalloc_space_(nullptr),
dlmalloc_space_(nullptr),
@@ -370,6 +371,7 @@
boot_class_path_locations,
image_file_name,
image_instruction_set,
+ image_space_loading_order,
heap_reservation_size,
&boot_image_spaces,
&heap_reservation)) {